[
https://issues.apache.org/jira/browse/SCM-805?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16506299#comment-16506299
]
ASF GitHub Bot commented on SCM-805:
------------------------------------
michael-o commented on issue #55: Fix for SCM-805
URL: https://github.com/apache/maven-scm/pull/55#issuecomment-395831201
Look:
mosipov@mikaw10 MINGW64 /d/Entwicklung/Projekte/maven-scm (SCM-805)
$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Fix for SCM-805:
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
M
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
M
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
M
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Falling back to patching base and 3-way merge...
Auto-merging
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
CONFLICT (content): Merge conflict in
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Auto-merging
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
CONFLICT (content): Merge conflict in
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
Auto-merging
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
Auto-merging
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
Patch failed at 0001 Fix for SCM-805:
The copy of the patch that failed is found in: .git/rebase-apply/patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Add SVN --pin-externals option to copy command (branch/tag)
> -----------------------------------------------------------
>
> Key: SCM-805
> URL: https://issues.apache.org/jira/browse/SCM-805
> Project: Maven SCM
> Issue Type: Improvement
> Components: maven-scm-provider-svn
> Affects Versions: 1.9.5
> Environment: SVN 1.9+
> Reporter: Eduardo Hernández Guerra
> Assignee: Michael Osipov
> Priority: Major
> Labels: externals, svn, tag
> Fix For: 1.10.1
>
>
> Starting from version 1.9, SVN client now supports the --pin-externals option
> for the copy command, which is to be used when tagging.
> I believe this should be implemented by default in SVN tag operations, and it
> optionally could be disabled via a parameter.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
