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 2011/07/24 21:05:35 UTC
svn commit: r1150469 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Sun Jul 24 19:05:34 2011
New Revision: 1150469
URL: http://svn.apache.org/viewvc?rev=1150469&view=rev
Log:
* tools/dist/backport.pl: Fix the pattern.
Tested by: me
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=1150469&r1=1150468&r2=1150469&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Sun Jul 24 19:05:34 2011
@@ -67,7 +67,8 @@ sub merge {
my $backupfile = "backport_pl.$$.tmp";
if ($entry{branch}) {
- $pattern = "$entry{branch} branch";
+ # NOTE: This doesn't escape the branch into the pattern.
+ $pattern = printf '^ [*] %s branch\|Branch:\n *%s', $entry{branch}, $entry{branch};
$mergeargs = "--reintegrate $BRANCHES/$entry{branch}";
print $logmsg_fh "Reintergrate the $entry{header}:";
print $logmsg_fh "";