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

[da...@apache.org]

Author: danielsh
Date: Mon Jul  8 14:38:54 2013
New Revision: 1500774

URL: http://svn.apache.org/r1500774
Log:
* tools/dist/backport.pl
  (main): Detect and handle an svn failure mode.

Found by: stefan2

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=1500774&r1=1500773&r2=1500774&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Mon Jul  8 14:38:54 2013
@@ -590,6 +590,9 @@ sub main {
   # ### TODO: both here and in merge(), unlink files that previous merges added
   # When running from cron, there shouldn't be local mods.  (For interactive
   # usage, we preserve local mods to STATUS.)
+  system("$SVN info $STATUS >/dev/null") == 0
+    or die "$0: svn error; point \$SVN to an appropriate binary";
+
   if (`$SVN status -q $STATUS`) {
     die  "Local mods to STATUS file $STATUS" if $YES;
     warn "Local mods to STATUS file $STATUS";