You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by da...@apache.org on 2013/07/31 03:15:46 UTC

svn commit: r1508700 - /subversion/trunk/tools/dist/backport.pl

Author: danielsh
Date: Wed Jul 31 01:15:46 2013
New Revision: 1508700

URL: http://svn.apache.org/r1508700
Log:
backport.pl interactive mode: eliminate needless "Revert?" prompts.

To reproduce:
    echo ynq | backport.pl

* tools/dist/backport.pl
  (revert): Reset the global counter $MERGED_SOMETHING so that we don't call
    this function again in the exit path.

Modified:
    subversion/trunk/tools/dist/backport.pl

Modified: subversion/trunk/tools/dist/backport.pl
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1508700&r1=1508699&r2=1508700&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Wed Jul 31 01:15:46 2013
@@ -484,6 +484,7 @@ sub revert {
   system "$SVN revert -R ./" . ($YES && $MAY_COMMIT ne 'true'
                              ? " -q" : "");
   move "$STATUS.$$.tmp", $STATUS;
+  $MERGED_SOMETHING = 0;
 }
 
 sub maybe_revert {