Author: danielsh
Date: Sun Feb 26 13:13:28 2012
New Revision: 1293830
URL: http://svn.apache.org/viewvc?rev=1293830&view=rev
Log:
* tools/dist/backport.pl: Tweak the sleep workaround.
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=1293830&r1=1293829&r2=1293830&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Sun Feb 26 13:13:28 2012
@@ -125,7 +125,10 @@ EOF
$script .= <<"EOF" if $entry{branch};
reinteg_rev=\`$SVN info $STATUS | sed -ne 's/Last Changed Rev: //p'\`
if $WET_RUN; then
+ # Sleep to avoid out-of-order commit notifications
+ if [ -n "$YES" ]; then sleep 15; fi
$SVNq rm $BRANCHES/$entry{branch} -m "Remove the '$entry{branch}' branch,
reintegrated in r\$reinteg_rev."
+ if [ -n "$YES" ]; then sleep 1; fi
else
echo "Removing reintegrated '$entry{branch}' branch"
fi
@@ -137,8 +140,6 @@ EOF
unlink $backupfile if -z $backupfile;
unlink $logmsg_filename unless $? or $!;
-
- sleep 15 if $YES; # avoid out-of-order commit notifications
}
sub sanitize_branch {
