You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by br...@apache.org on 2005/06/26 11:58:33 UTC
svn commit: r201797 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command:
checkout/SvnCheckOutConsumer.java update/SvnUpdateConsumer.java
Author: brett
Date: Sat Jun 25 16:05:43 2005
New Revision: 201797
URL: http://svn.apache.org/viewcvs?rev=201797&view=rev
Log:
fix problem parsing response of certain svn clients
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateConsumer.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutConsumer.java?rev=201797&r1=201796&r2=201797&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutConsumer.java Sat Jun 25 16:05:43 2005
@@ -64,7 +64,7 @@
String statusString = line.substring( 0, 1 );
- String file = line.substring( 3 );
+ String file = line.substring( 3 ).trim();
ScmFileStatus status;
@@ -101,6 +101,7 @@
// If the file isn't a file; don't add it.
if ( !new File( workingDirectory, file ).isFile() )
{
+ logger.debug( "Skipping non-file: " + file );
return;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateConsumer.java?rev=201797&r1=201796&r2=201797&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateConsumer.java Sat Jun 25 16:05:43 2005
@@ -70,7 +70,7 @@
String statusString = line.substring( 0, 1 );
- String file = line.substring( 3 );
+ String file = line.substring( 3 ).trim();
ScmFileStatus status;
@@ -112,6 +112,7 @@
// If the file isn't a file; don't add it.
if ( !new File( workingDirectory, file ).isFile() )
{
+ logger.debug( "Skipping non-file: " + file );
return;
}