maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1035099 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Date Sun, 14 Nov 2010 23:20:07 GMT
Author: olamy
Date: Sun Nov 14 23:20:07 2010
New Revision: 1035099

URL: http://svn.apache.org/viewvc?rev=1035099&view=rev
Log:
[SCM-583] mvn release:prepare fails when there is a different branch in hg outgoing changes
SUbmitted by Laurent Perez

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java?rev=1035099&r1=1035098&r2=1035099&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Sun Nov 14 23:20:07 2010
@@ -69,6 +69,11 @@ public class HgUtils
         diffExitCodes.add( new Integer( 1 ) ); //Conflicts in merge-like or changes in diff-like
         diffExitCodes.add( new Integer( 2 ) ); //Unrepresentable diff changes
         EXIT_CODE_MAP.put( HgCommandConstants.DIFF_CMD, diffExitCodes );
+        //Outgoing is different
+        List outgoingExitCodes = new ArrayList( );
+        outgoingExitCodes.add( new Integer( 0 ) ); //There are changes
+        outgoingExitCodes.add( new Integer( 1 ) ); //No changes
+        EXIT_CODE_MAP.put( HgCommandConstants.OUTGOING_CMD, outgoingExitCodes );        
     }
 
     public static ScmResult execute( HgConsumer consumer, ScmLogger logger, File workingDir,
String[] cmdAndArgs )



Mime
View raw message