Author: danielsh
Revision: 1569068
Modified property: svn:log
Modified: svn:log at Tue Feb 18 09:16:11 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Feb 18 09:16:11 2014
@@ -3,6 +3,13 @@ Fix backport script to not require Branc
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.
+[ This change was wrong, because it made $pattern too liberal. (It made
+ $pattern start with unanchored, optional groups, which caused $pattern
+ to match any entry that mentions the victim branch, not only the entry that
+ nominates that branch.)
+
+ This was fixed in r1569235. ]
+
* tools/dist/backport.pl
(merge): Make the branch header prefix optional when searching for the entry
to remove before committing.
