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

[da...@apache.org]

Author: danielsh
Date: Thu Jul 18 06:17:26 2013
New Revision: 1504372

URL: http://svn.apache.org/r1504372
Log:
backport.pl conflicts mode: diff the conflicted files, to allow seeing the
reason for the conflict in the bot output.

* tools/dist/backport.pl
  (handle_entry): Print a diff of files in @conflicts.

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=1504372&r1=1504371&r2=1504372&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Jul 18 06:17:26 2013
@@ -541,13 +541,14 @@ sub handle_entry {
         merge %entry;
 
         my $output = `$SVN status`;
-        my (@conflicts) = ($output =~ m#^(?:C|.C|...C).*/(.*)#mg);
+        my (@conflicts) = ($output =~ m#^(?:C...|.C..|...C)...\s(.*)#mg);
         if (@conflicts and !$entry{depends}) {
           $ERRORS{$entry{id}} //= "Conflicts merging the $entry{header}: "
-                                  . (join ', ', @conflicts);
+                                  . (join ', ', map m#.*/(.*)#, @conflicts);
           say STDERR "Conflicts merging the $entry{header}!";
           say STDERR "";
           say STDERR $output;
+          system "$SVN diff -- @conflicts";
         } elsif (!@conflicts and $entry{depends}) {
           # Not a warning since svn-role may commit the dependency without
           # also committing the dependent in hte same pass.