Fixed issue #69: Add a check for merge conflict markers in YAML files #99
Conversation
This file contains 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
Make test pass.
…s no merge conflict or other load error. Move loading tests to their own group.
… YAML with no issues in it.
…inue to throw Psych::SyntaxErrors.
…erwise raise original syntax error. Assert that error message is good. Remove unnecessary value assigns.
| @@ -158,7 +158,7 @@ def pretty_print(q) # :nodoc: | |||
| # True if +version+ satisfies this Requirement. | |||
|
|
|||
| def satisfied_by?(version) | |||
| # #28965: syck has a bug with unquoted '=' YAML.loading as YAML::DefaultKey | |||
| # #28965: syck has a bug with unquoted '=' YAMLHelper.loading as YAML::DefaultKey | |||
There was a problem hiding this comment.
This probably still wants to stay as YAML 👍
|
For clarity, I mentioned in IRC that the 1.9/2.0 stuff looks fine, I think its because the older YAML uses |
The YAML implementation in 1.8.7 did not use Psych.
use generic exception handling
|
Superceded by pull request #100 |
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.
No description provided.