Author: danielsh
Date: Wed Jul 3 18:30:14 2013
New Revision: 1499508
URL: http://svn.apache.org/r1499508
Log:
* tools/dist/backport.pl
(merge): Point out that local changes are preserved. I forgot about that..
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=1499508&r1=1499507&r2=1499508&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Wed Jul 3 18:30:14 2013
@@ -166,7 +166,12 @@ EOF
print SHELL $script;
close SHELL or warn "$0: sh($?): $! (in '$entry{header}')";
- unlink $backupfile if -z $backupfile;
+ if (-z $backupfile) {
+ unlink $backupfile;
+ } else {
+ warn "Local mods saved to '$backupfile'\n";
+ }
+
unlink $logmsg_filename unless $? or $!;
}
