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 2005/12/29 10:40:30 UTC

svn commit: r359763 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java

Author: evenisse
Date: Thu Dec 29 01:40:28 2005
New Revision: 359763

URL: http://svn.apache.org/viewcvs?rev=359763&view=rev
Log:
PR: SCM-125

Add interpretations of the "M" and "?" states for the CVS provider.

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java?rev=359763&r1=359762&r2=359763&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java Thu Dec 29 01:40:28 2005
@@ -69,6 +69,14 @@
         {
             files.add( new ScmFile( file, ScmFileStatus.CONFLICT ) );
         }
+        else if ( status.equals( "M " ) )
+        {
+            files.add( new ScmFile( file, ScmFileStatus.MODIFIED ) );
+        }
+        else if ( status.equals( "? " ) )
+        {
+            files.add( new ScmFile( file, ScmFileStatus.UNKNOWN ) );
+        }
         else
         {
             logger.warn( "Unknown status: '" + status + "'." );