Update libblifparse #1388
Merged
Update libblifparse #1388
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36576ac9d Add support for quoted strings. ae26a4d35 Send parsed test data to a log file when testing 5dc423a92 Add Travis CI config git-subtree-dir: libs/EXTERNAL/libblifparse git-subtree-split: 36576ac9df8c72c8c3d85a9b8f761d7b403c633f
libblifparse: Updating libs/EXTERNAL/libblifparse/ (external git subtree from https://github.com/kmurray/libblifparse.git master)
probot-autolabeler
bot
added
external_libs
infra
|
Looks good. I'm fine with merging this; just needs the conflict resolved. |
|
What conflict? |
Not sure, but this is the state of the PR:This branch cannot be rebased due to conflicts |
|
@vaughnbetz -- Seemed to merge fine for me? |
|
Weird; if you merged it it's done in any case. |
|
@vaughnbetz I suspect you've run into an issue I've also seen with github and subtrees. Github won't rebase and merge subtree updates (even if they would just be fast forward merges). However it will allow you to do a vanilla merge (producing a merge commit) as @mithro did. |
|
Thanks Kevin. I'll look for that next time -- this mystified me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Update libblifparse git subtree.
Related Issue
Motivation and Context
eblif extensions for .attr and .param have support for string parameters, which may be contain strings which contain spaces. libblifparse has been updated to support a simple string quote, with escaping character support initially.
How Has This Been Tested?
libblifparse has new tests.
Types of changes
Checklist: