Mercurial > public > mercurial-scm > hg

diff tests/test-revert-interactive.t @ 32068:51fdedd29b0a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
record: update help message to use operation instead of "record" (issue5432) Update the hunk selector help message to use the operation name instead of using "record" for all operations. Extract the help message in the same way as other single and multiple message line. Update tests to make sure that both "revert" and "discard" variants are tested.
author Boris Feld <boris.feld@octobus.net>
date Mon, 24 Apr 2017 17:13:24 +0200
parents 3af9a9628ecf
children 5707bfe04deb
line wrap: on
line diff
--- a/tests/test-revert-interactive.t	Mon Apr 24 14:38:30 2017 -0400
+++ b/tests/test-revert-interactive.t	Mon Apr 24 17:13:24 2017 +0200
@@ -46,6 +46,7 @@
   > y
   > y
   > y
+  > ?
   > y
   > n
   > n
@@ -88,6 +89,17 @@
    3
    4
    5
+  revert change 3/6 to 'folder1/g'? [Ynesfdaq?] ?
+  
+  y - yes, revert this change
+  n - no, skip this change
+  e - edit this change manually
+  s - skip remaining changes to this file
+  f - revert remaining changes to this file
+  d - done, skip remaining changes and files
+  a - revert all changes to all remaining files
+  q - quit, reverting no changes
+  ? - ? (display help)
   revert change 3/6 to 'folder1/g'? [Ynesfdaq?] y
   
   @@ -1,5 +2,6 @@
@@ -264,6 +276,7 @@
   M folder1/g
   $ hg revert --interactive f << EOF
   > y
+  > ?
   > y
   > n
   > n
@@ -279,6 +292,17 @@
    3
    4
    5
+  discard change 1/2 to 'f'? [Ynesfdaq?] ?
+  
+  y - yes, discard this change
+  n - no, skip this change
+  e - edit this change manually
+  s - skip remaining changes to this file
+  f - discard remaining changes to this file
+  d - done, skip remaining changes and files
+  a - discard all changes to all remaining files
+  q - quit, discarding no changes
+  ? - ? (display help)
   discard change 1/2 to 'f'? [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
@@ -436,4 +460,3 @@
   forget added file newfile (Yn)? y
   $ hg status
   ? newfile
-