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

[da...@apache.org]

Author: danielsh
Date: Fri Dec  7 10:53:29 2012
New Revision: 1418273

URL: http://svn.apache.org/viewvc?rev=1418273&view=rev
Log:
* tools/dist/backport.pl
  (main): Quickly duct tape a bug from recurring.
    (The bug manifest in r1417733.  It seems a first run failed to merge 
    a group, and the subsequent run did an out-of-band 'svn up' --- which
    text-conflicted --- and then parsed STATUS despite the text conflict.)

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=1418273&r1=1418272&r2=1418273&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Fri Dec  7 10:53:29 2012
@@ -233,6 +233,9 @@ sub main {
   die "A vim with the +ex_extra feature is required"
       if `${VIM} --version` !~ /[+]ex_extra/;
 
+  # ### TODO: need to run 'revert' here
+  # ### TODO: both here and in merge(), unlink files that previous merges added
+  die "Local mods to STATUS file $STATUS" if `$SVN status -q $STATUS`;
   @ARGV = $STATUS;
 
   # Skip most of the file