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 ev...@apache.org on 2006/01/31 23:48:41 UTC
svn commit: r373936 -
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateConsumer.java
Author: evenisse
Date: Tue Jan 31 14:48:37 2006
New Revision: 373936
URL: http://svn.apache.org/viewcvs?rev=373936&view=rev
Log:
Parse correctly "Restored" line
Modified:
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/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=373936&r1=373935&r2=373936&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 Tue Jan 31 14:48:37 2006
@@ -36,6 +36,8 @@
private final static String AT_REVISION_TOKEN = "At revision";
+ private final static String RESTORED_TOKEN = "Restored";
+
private ScmLogger logger;
private File workingDirectory;
@@ -92,6 +94,10 @@
return;
}
+ else if ( line.startsWith( RESTORED_TOKEN ) )
+ {
+ return;
+ }
else if ( statusString.equals( "A" ) )
{
status = ScmFileStatus.ADDED;
@@ -106,7 +112,7 @@
}
else
{
- logger.info( "Unknown file status: '" + statusString + "'." );
+ logger.info( "Unknown file status: '" + statusString + "' in line " + line + "." );
return;
}