Author: danielsh
Date: Fri Aug 2 10:39:45 2013
New Revision: 1509611
URL: http://svn.apache.org/r1509611
Log:
* tools/dist/backport.pl
(POSIX::strftime): Import.
(merge): Give the tempfiles more useful names.
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=1509611&r1=1509610&r2=1509611&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Fri Aug 2 10:39:45 2013
@@ -25,7 +25,7 @@ use Term::ReadKey qw/ReadMode ReadKey/;
use File::Basename qw/basename/;
use File::Copy qw/copy move/;
use File::Temp qw/tempfile/;
-use POSIX qw/ctermid/;
+use POSIX qw/ctermid strftime/;
############### Start of reading values from environment ###############
@@ -165,7 +165,9 @@ sub merge {
my ($logmsg_fh, $logmsg_filename) = tempfile();
my ($mergeargs, $pattern);
- my $backupfile = "backport_pl.$$.tmp";
+ # Include the time so it's easier to find the interesting backups.
+ my $backupfile = strftime "backport_pl.%Y%m%d-%H%M%S.$$.tmp", localtime;
+ die if -s $backupfile;
if ($entry{branch}) {
my $vim_escaped_branch =
