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 2014/02/12 09:26:43 UTC
svn commit: r1567563 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Wed Feb 12 08:26:42 2014
New Revision: 1567563
URL: http://svn.apache.org/r1567563
Log:
backport.pl: Follow-up to r1567523.
* tools/dist/backport.pl
(merge): Relax teh indentation pattern here, too.
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=1567563&r1=1567562&r2=1567563&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Wed Feb 12 08:26:42 2014
@@ -241,7 +241,7 @@ sub merge {
}
say $logmsg_fh "";
} elsif (@{$entry{revisions}}) {
- $pattern = '^ [*] \V' . 'r' . $entry{revisions}->[0];
+ $pattern = '^ *[*] \V' . 'r' . $entry{revisions}->[0];
$mergeargs = join " ",
($entry{accept} ? "--accept=$entry{accept}" : ()),
(map { "-c$_" } @{$entry{revisions}}),