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/27 16:38:33 UTC
svn commit: r1507655 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Sat Jul 27 14:38:33 2013
New Revision: 1507655
URL: http://svn.apache.org/r1507655
Log:
* tools/dist/backport.pl
(merge): Test the correct $YES (envvar, as opposed to Perl var).
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=1507655&r1=1507654&r2=1507655&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Sat Jul 27 14:38:33 2013
@@ -219,7 +219,7 @@ fi
if $MAY_COMMIT; then
$VIM -e -s -n -N -i NONE -u NONE -c '/$pattern/normal! dap' -c wq $STATUS
$SVNq commit -F $logmsg_filename
-elif test 1 -ne $YES; then
+elif test -z "\$YES"; then
echo "Would have committed:"
echo '[[['
$SVN status -q
@@ -236,7 +236,7 @@ if $MAY_COMMIT; then
if [ -n "\$YES" ]; then sleep 15; fi
$SVNq rm $BRANCHES/$entry{branch} -m "Remove the '$entry{branch}' branch, $reintegrated_word in r\$reinteg_rev."
if [ -n "\$YES" ]; then sleep 1; fi
-elif test 1 -ne $YES; then
+elif test -z "\$YES"; then
echo "Would remove $reintegrated_word '$entry{branch}' branch"
fi
EOF