asfgit closed pull request #58: [SCM-859] SVN-Update-doesnt-work
URL: https://github.com/apache/maven-scm/pull/58
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
index 5edcbbc8d..e79abc76f 100644
---
a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
+++
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
@@ -136,7 +136,7 @@ public static Commandline createCommandLine(
SvnScmProviderRepository repository
cl.createArg().setValue( version.getName() );
}
- cl.createArg().setValue( workingDir );
+ cl.createArg().setValue( workingDir + "@" );
}
else
{
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/update/SvnUpdateCommandTest.java
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
index 90a71d4f7..70c951144 100644
---
a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
+++
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
@@ -43,49 +43,49 @@ public void testCommandLineWithEmptyTag()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk";, new ScmTag( "" ),
- "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithEmptyBranch()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk";, new ScmBranch( ""
),
- "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithEmptyVersion()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk";, new ScmRevision(
"" ),
- "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithWhitespaceTag()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk";, new ScmTag( " "
),
- "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithWhitespaceBranch()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk";, new ScmBranch( "
" ),
- "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithWhitespaceRevision()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk";, new ScmRevision(
" " ),
- "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithoutTag()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk";, null,
- "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " +
getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineTag()
@@ -93,7 +93,7 @@ public void testCommandLineTag()
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";, new
ScmRevision( "10" ),
"svn --username anonymous --no-auth-cache
--non-interactive update -r 10 " +
- getUpdateTestFile().getAbsolutePath() );
+ getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithUsernameAndTag()
@@ -101,7 +101,7 @@ public void testCommandLineWithUsernameAndTag()
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";, new
ScmRevision( "10" ),
"svn --username anonymous --no-auth-cache
--non-interactive update -r 10 " +
- getUpdateTestFile().getAbsolutePath() );
+ getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithCygwinProperty()
@@ -114,7 +114,7 @@ public void testCommandLineWithCygwinProperty()
{
assertTrue( SvnUtil.getSettings().isUseCygwinPath() );
testCommandLine( "scm:svn:http://foo.com/svn/trunk";, null,
- "svn --non-interactive update
/mnt/c/my_working_directory",
+ "svn --non-interactive update
/mnt/c/my_working_directory@",
new File( "c:\\my_working_directory" ) );
}
finally
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
