Add support for 'conflict' parameter to populate svn --accept arg #220
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
|
Thanks for contributing, would it be possible for you to add a tests for this new functionality. |
|
Tests added and rebased, thanks. |
|
spec failures are in git, not in (your) svn tests. |
|
Can someone remove needs-rebase, needs-tests tags please? |
tphoney
added a commit
that referenced
this pull request
Mar 30, 2015
Add support for 'conflict' parameter to populate svn --accept arg
cegeka-jenkins
pushed a commit
to cegeka/puppet-vcsrepo
that referenced
this pull request
Jan 3, 2018
Add support for 'conflict' parameter to populate svn --accept arg
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Allow setting the subversion behaviour on encountering conflicts to something other than the default (postpone), which is undesirable in many cases.
https://tickets.puppetlabs.com/browse/MODULES-1551