Repository: maven-scm Updated Branches: refs/heads/master 1aa703942 -> 5c303e41f
[SCM-813] SVN fails when trying to create a branch with nested directories Modified tests to include --parents check. Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/5c303e41 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/5c303e41 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/5c303e41 Branch: refs/heads/master Commit: 5c303e41f51ed8c4698863940ef6099e7c825faa Parents: 1aa7039 Author: Michael Osipov <[email protected]> Authored: Tue Dec 22 16:40:01 2015 +0100 Committer: Michael Osipov <[email protected]> Committed: Tue Dec 22 16:40:01 2015 +0100 ---------------------------------------------------------------------- .../svnexe/command/branch/SvnExeBranchCommandTckTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/5c303e41/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java index c3e04db..021debd 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java @@ -49,7 +49,7 @@ public class SvnExeBranchCommandTckTest testCommandLine( "scm:svn:https://foo.com/svn/trunk";, "svnbranch", messageFile, "user", "svn --username user --no-auth-cache --non-interactive copy --file " + messageFile.getAbsolutePath() - + " --revision 2 https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch";, + + " --parents --revision 2 https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch";, scmBranchParameters ); } @@ -64,7 +64,7 @@ public class SvnExeBranchCommandTckTest testCommandLine( "scm:svn:https://foo.com/svn/trunk";, "svnbranch", messageFile, "user", "svn --username user --no-auth-cache --non-interactive copy --file " + messageFile.getAbsolutePath() - + " https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch";, scmBranchParameters ); + + " --parents https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch";, scmBranchParameters ); } public void testBranchUserNameSvnHttps() @@ -75,7 +75,7 @@ public class SvnExeBranchCommandTckTest testCommandLine( "scm:svn:https://foo.com/svn/trunk";, "svnbranch", messageFile, "user", "svn --username user --no-auth-cache --non-interactive copy --file " + messageFile.getAbsolutePath() - + " . https://foo.com/svn/branches/svnbranch";, null ); + + " --parents . https://foo.com/svn/branches/svnbranch";, null ); } public void testBranchUserNameSvnSsh() @@ -86,7 +86,7 @@ public class SvnExeBranchCommandTckTest testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svnbranch", messageFile, "user", "svn --username user --no-auth-cache --non-interactive copy --file " + messageFile.getAbsolutePath() - + " . svn+ssh://[email protected]/svn/branches/svnbranch" ); + + " --parents . svn+ssh://[email protected]/svn/branches/svnbranch" ); } private void testCommandLine( String scmUrl, String branch, File messageFile, String user, String commandLine,
