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

[da...@apache.org]

Author: danielsh
Date: Sat May 21 14:49:31 2011
New Revision: 1125718

URL: http://svn.apache.org/viewvc?rev=1125718&view=rev
Log:
* tools/dist/backport.pl
  (merge): Remove the reintergated branch, too.

Tested by: none

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=1125718&r1=1125717&r2=1125718&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Sat May 21 14:49:31 2011
@@ -90,7 +90,13 @@ $VIM -e -s -n -N -i NONE -u NONE -c '/^ 
 $SVN commit -F $logmsg_filename
 EOF
 
-  open SHELL, '|-', qw#/bin/sh -x# or die $!;
+  $script .= <<"EOF" if $entry{branch};
+reinteg_rev=\`$SVN info $STATUS | sed -ne 's/Last Changed Rev: //p'\`
+$SVN rm $BRANCHES/$entry{branch}\
+        -m "Remove the '$entry{branch}' branch, reintegrated in r\$reinteg_rev."
+EOF
+
+  open SHELL, '|-', qw#/bin/cat# or die $!;
   print SHELL $script;
   close SHELL or warn "$0: sh($?): $!";