Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 34269 invoked from network); 14 Nov 2010 23:20:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Nov 2010 23:20:50 -0000 Received: (qmail 58470 invoked by uid 500); 14 Nov 2010 23:21:22 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 58420 invoked by uid 500); 14 Nov 2010 23:21:22 -0000 Mailing-List: contact scm-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: scm-dev@maven.apache.org Delivered-To: mailing list scm-commits@maven.apache.org Received: (qmail 58413 invoked by uid 99); 14 Nov 2010 23:21:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Nov 2010 23:21:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Nov 2010 23:21:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AA2E02388903; Sun, 14 Nov 2010 23:20:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm-commits@maven.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101114232007.AA2E02388903@eris.apache.org> 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 )