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/20 02:51:29 UTC
svn commit: r1570048 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Thu Feb 20 01:51:29 2014
New Revision: 1570048
URL: http://svn.apache.org/r1570048
Log:
backport.pl conflicts mode:
* tools/dist/backport.pl
(handle_entry): Fix the check for tree conflicts to look at the right column.
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=1570048&r1=1570047&r2=1570048&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Feb 20 01:51:29 2014
@@ -766,7 +766,11 @@ sub handle_entry {
merge %entry;
my $output = `$SVN status`;
- my (@conflicts) = ($output =~ m#^(?:C...|.C..|...C)...\s(.*)#mg);
+
+ # Pre-1.6 svn's don't have the 7th column, so fake it.
+ $output =~ s/^(......)/$1 /mg if $SVNvsn < 1_006_000;
+
+ my (@conflicts) = ($output =~ m#^(?:C......|.C.....|......C)\s(.*)#mg);
if (@conflicts and !$entry{depends}) {
$ERRORS{$entry{id}} //= [\%entry,
sprintf "Conflicts on %s%s%s",