Author: danielsh
Date: Wed Jul 3 18:41:07 2013
New Revision: 1499512
URL: http://svn.apache.org/r1499512
Log:
Followup to r1471538 and r1485382:
* tools/dist/backport.pl
(merge): Preserve STATUS in interactive mode, not in batch mode (wherein it
is guaranteed by main() not to have local mods anyway).
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=1499512&r1=1499511&r2=1499512&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Wed Jul 3 18:41:07 2013
@@ -120,9 +120,11 @@ if $DEBUG; then
set -x
fi
$SVN diff > $backupfile
-cp STATUS STATUS.$$
+if ! $MAY_COMMIT ; then
+ cp STATUS STATUS.$$
+fi
$SVNq revert -R .
-if $MAY_COMMIT ; then
+if ! $MAY_COMMIT ; then
mv STATUS.$$ STATUS
fi
$SVNq up
