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/18 10:17:22 UTC
svn commit: r1569238 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Tue Feb 18 09:17:22 2014
New Revision: 1569238
URL: http://svn.apache.org/r1569238
Log:
* tools/dist/backport.pl
(revert): Add error checking.
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=1569238&r1=1569237&r2=1569238&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Tue Feb 18 09:17:22 2014
@@ -624,8 +624,10 @@ sub revert {
my %args = @_;
die "Bug: \$args{verbose} undefined" unless exists $args{verbose};
copy $STATUS, "$STATUS.$$.tmp";
- system "$SVN revert -q $STATUS";
- system "$SVN revert -R ./" . (" -q" x !$args{verbose});
+ system("$SVN revert -q $STATUS") == 0
+ or die "revert failed ($?): $!";
+ system("$SVN revert -R ./" . (" -q" x !$args{verbose})) == 0
+ or die "revert failed ($?): $!";
move "$STATUS.$$.tmp", $STATUS;
$MERGED_SOMETHING = 0;
}