Author: danielsh
Date: Mon Apr 15 17:27:16 2013
New Revision: 1468162
URL: http://svn.apache.org/r1468162
Log:
* tools/dist/backport.pl
(merge): Fix a Vim regexp.
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=1468162&r1=1468161&r2=1468162&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Mon Apr 15 17:27:16 2013
@@ -78,7 +78,7 @@ sub merge {
if ($entry{branch}) {
# NOTE: This doesn't escape the branch into the pattern.
- $pattern = sprintf '\V\(%s branch(es)?\|branches\/%s\|Branch(es)?:\n
*%s\)', $entry{branch}, $entry{branch}, $entry{branch};
+ $pattern = sprintf '\V\(%s branch(es)?\|branches\/%s\|Branch\(es\)\?:
\*\n\? \*%s\)', $entry{branch}, $entry{branch}, $entry{branch};
$mergeargs = "--reintegrate $BRANCHES/$entry{branch}";
print $logmsg_fh "Reintegrate the $entry{header}:";
print $logmsg_fh "";
