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

[br...@apache.org]

Author: breser
Date: Mon Feb 17 18:14:13 2014
New Revision: 1569068

URL: http://svn.apache.org/r1569068
Log:
Fix backport script to not require Branch: header.

This makes it so that if the revision line has the branch on it and there is
no Branch: header the merge will complete rather than failing.

* tools/dist/backport.pl
  (merge): Make the branch header prefix optional when searching for the entry
    to remove before committing.

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=1569068&r1=1569067&r2=1569068&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Mon Feb 17 18:14:13 2014
@@ -235,7 +235,7 @@ sub merge {
       map { sprintf '\[%s%s]', $_, ($_ x ($_ eq '\\')) }
       split //,
       $entry{branch};
-    $pattern = sprintf '\VBranch: \*\n\? \*\(\.\*\/branches\/\)\?%s',
+    $pattern = sprintf '\V\(Branch: \*\n\?\)\? \*\(\.\*\/branches\/\)\?%s',
                  $vim_escaped_branch;
     if ($SVNvsn >= 1_008_000) {
       $mergeargs = "$BRANCHES/$entry{branch}";