svn commit: r1494589 - /subversion/trunk/tools/dist/backport.pl

[da...@apache.org]

Author: danielsh
Date: Wed Jun 19 12:38:05 2013
New Revision: 1494589

URL: http://svn.apache.org/r1494589
Log:
* tools/dist/backport.pl
  (usage): Document the interactive mode.

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=1494589&r1=1494588&r2=1494589&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Wed Jun 19 12:38:05 2013
@@ -50,13 +50,12 @@ sub usage {
   my $basename = $0;
   $basename =~ s#.*/##;
   print <<EOF;
-Run this from the root of your release branch (e.g., 1.6.x) working copy.
+Run this from the root of your release branch (e.g., 1.6.x) working copy.  Use
+a working copy 'svn revert -R .' can be run on at any time, as this script
+will run revert prior to every merge.
 
-For each entry in STATUS, you will be prompted whether to merge it.
-
-WARNING:
-If you accept the prompt, $basename will revert all local changes and will
-commit the merge immediately.
+For each entry in STATUS, you will be prompted whether to merge it.  The
+merge will not be committed.
 
 The 'svn' binary defined by the environment variable \$SVN, or otherwise the
 'svn' found in \$PATH, will be used to manage the working copy.