subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1239619 - /subversion/trunk/tools/dist/backport.pl
Date Thu, 02 Feb 2012 13:54:14 GMT
Author: danielsh
Date: Thu Feb  2 13:54:14 2012
New Revision: 1239619

URL: http://svn.apache.org/viewvc?rev=1239619&view=rev
Log:
* tools/dist/backport.pl
  (merge): Correct use of $WET_RUN.

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=1239619&r1=1239618&r2=1239619&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Feb  2 13:54:14 2012
@@ -91,6 +91,9 @@ sub merge {
   my $script = <<"EOF";
 #!/bin/sh
 set -e
+if $WET_RUN; then
+  set -x
+fi
 $SVN diff > $backupfile
 $SVN revert -R .
 $SVN up
@@ -114,7 +117,7 @@ else
 fi
 EOF
 
-  open SHELL, '|-', qw#/bin/sh#, ($WET_RUN ? () : '-x') or die $!;
+  open SHELL, '|-', qw#/bin/sh# or die $!;
   print SHELL $script;
   close SHELL or warn "$0: sh($?): $!";
 



Mime
View raw message