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 2011/05/26 17:21:15 UTC
svn commit: r1127958 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Thu May 26 15:21:15 2011
New Revision: 1127958
URL: http://svn.apache.org/viewvc?rev=1127958&view=rev
Log:
* tools/dist/backup.pl
(merge): Fix compilation.
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=1127958&r1=1127957&r2=1127958&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu May 26 15:21:15 2011
@@ -64,6 +64,7 @@ sub merge {
my $mergeargs;
my $backupfile = "backport_pl.$$.tmp";
+
if ($entry{branch}) {
$mergeargs = "--reintegrate $BRANCHES/$entry{branch}";
print $logmsg_fh "Reintergrate the $BRANCHES/$entry{branch} branch:";
@@ -102,7 +103,7 @@ EOF
print SHELL $script;
close SHELL or warn "$0: sh($?): $!";
- unlink $backupfile if -z $backupfile.
+ unlink $backupfile if -z $backupfile;
unlink $logmsg_filename unless $? or $!;
}