theit commented on issue #55: Fix for SCM-805 URL: https://github.com/apache/maven-scm/pull/55#issuecomment-399924403 This is strange: ```shell theit:~/git/apache.org$ git clone https://github.com/apache/maven-scm.git && cd maven-scm Cloning into 'maven-scm'... remote: Counting objects: 54975, done. remote: Compressing objects: 100% (3/3), done. remote: Total 54975 (delta 0), reused 1 (delta 0), pack-reused 54972 Receiving objects: 100% (54975/54975), 11.19 MiB | 2.26 MiB/s, done. Resolving deltas: 100% (13817/13817), done. Checking out files: 100% (1670/1670), done. theit:~/git/apache.org/maven-scm$ git remote add upstream https://github.com/theit/maven-scm.git theit:~/git/apache.org/maven-scm$ git fetch upstream remote: Counting objects: 129, done. remote: Total 129 (delta 37), reused 37 (delta 37), pack-reused 92 Receiving objects: 100% (129/129), 12.85 KiB | 822.00 KiB/s, done. Resolving deltas: 100% (38/38), completed with 22 local objects. From https://github.com/theit/maven-scm * [new branch] MRELEASE-875 -> upstream/MRELEASE-875 * [new branch] SCM-435 -> upstream/SCM-435 * [new branch] SCM-805 -> upstream/SCM-805 * [new branch] master -> upstream/master * [new branch] scm-1.1.x -> upstream/scm-1.1.x theit:~/git/apache.org/maven-scm$ git merge -m "Merge remote-tracking branch 'upstream/SCM-805'" upstream/SCM-805 Merge made by the 'recursive' strategy. .../org/apache/maven/scm/ScmBranchParameters.java | 13 +++++++++ .../org/apache/maven/scm/ScmTagParameters.java | 13 +++++++++ .../org/apache/maven/scm/plugin/BranchMojo.java | 12 ++++++++ .../java/org/apache/maven/scm/plugin/TagMojo.java | 12 ++++++++ .../svnexe/command/branch/SvnBranchCommand.java | 6 ++++ .../svn/svnexe/command/tag/SvnTagCommand.java | 6 ++++ .../command/branch/SvnExeBranchCommandTckTest.java | 34 ++++++++++++++++++++++ .../command/tag/SvnExeTagCommandTckTest.java | 32 ++++++++++++++++++++ 8 files changed, 128 insertions(+) theit:~/git/apache.org/maven-scm$ ``` No merge conflicts...?
---------------------------------------------------------------- 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] With regards, Apache Git Services
