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

[da...@apache.org]

Author: danielsh
Date: Sun Jul  7 18:05:48 2013
New Revision: 1500499

URL: http://svn.apache.org/r1500499
Log:
* tools/dist/backport.pl
  (usage, handle_entry): Document r1500485.

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=1500499&r1=1500498&r2=1500499&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Sun Jul  7 18:05:48 2013
@@ -85,7 +85,10 @@ a:   Move the entry to the "Approved cha
      to enter a third +1 vote, type "a" "+" "1".
 e:   Edit the entry in $EDITOR.
      You will be prompted to commit your edits at the end.
-N:   Move to the next entry.
+N:   Move to the next entry.  Cache the entry in '$STATEFILE' and do not
+     prompt for it again (even across runs) until it is changed.
+ :   Move to the next entry, without adding the current one to the cache.
+     (That's a space character, ASCII 0x20.)
 
 After running a merge, you have the following options:
 
@@ -493,7 +496,7 @@ sub handle_entry {
     say "";
     say "Vetoes found!" if @vetoes;
 
-    given (prompt 'Go ahead? [y,±1,±0,q,e,a,N] ',
+    given (prompt 'Go ahead? [y,±1,±0,q,e,a, ,N] ',
                    verbose => 1, extra => qr/[+-]/) {
       when (/^y/i) {
         merge %entry;