Only ignore existing matches if preserve_all_lines is used #1858
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
|
Can one of the admins verify this patch? |
| methods: | ||
| "any" usebundle => dcs_check_diff("$(G.testfile).actual", | ||
| "$(G.testfile).expected", | ||
| "$(this.promise_filename)"); |
There was a problem hiding this comment.
Indentation skew. Did you use tabs ?
|
Code seems good. |
That option is documented to disable convergence, while preserve_block should respect existing occurances of the promiser within the selected region. Redmine #1525
|
Updates as per comments. Treating Windows explicitly, as using the printf version makes the test fail, probably due to subtle differences in quoting/newline treatment that I can't quite figure out. |
kacf
added a commit
that referenced
this pull request
Jul 23, 2014
Only ignore existing matches if preserve_all_lines is used
|
I didn't test Windows right now, it might still fail, but at least the solution shouldn't be far away. Will get to it in the next round of Windows tests. |
This pull request was closed.
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.
That option is documented to disable convergence, while preserve_block
should respect existing occurances of the promiser within the selected
region.
Redmine #1525