Mercurial > hg
comparison tests/test-revert-interactive.t @ 32068:51fdedd29b0a stable
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 |
comparison
equal
deleted
inserted
replaced
32067:52cca17ac523 | 32068:51fdedd29b0a |
---|---|
44 > y | 44 > y |
45 > y | 45 > y |
46 > y | 46 > y |
47 > y | 47 > y |
48 > y | 48 > y |
49 > ? | |
49 > y | 50 > y |
50 > n | 51 > n |
51 > n | 52 > n |
52 > EOF | 53 > EOF |
53 reverting f | 54 reverting f |
86 1 | 87 1 |
87 2 | 88 2 |
88 3 | 89 3 |
89 4 | 90 4 |
90 5 | 91 5 |
92 revert change 3/6 to 'folder1/g'? [Ynesfdaq?] ? | |
93 | |
94 y - yes, revert this change | |
95 n - no, skip this change | |
96 e - edit this change manually | |
97 s - skip remaining changes to this file | |
98 f - revert remaining changes to this file | |
99 d - done, skip remaining changes and files | |
100 a - revert all changes to all remaining files | |
101 q - quit, reverting no changes | |
102 ? - ? (display help) | |
91 revert change 3/6 to 'folder1/g'? [Ynesfdaq?] y | 103 revert change 3/6 to 'folder1/g'? [Ynesfdaq?] y |
92 | 104 |
93 @@ -1,5 +2,6 @@ | 105 @@ -1,5 +2,6 @@ |
94 1 | 106 1 |
95 2 | 107 2 |
262 $ hg st | 274 $ hg st |
263 M f | 275 M f |
264 M folder1/g | 276 M folder1/g |
265 $ hg revert --interactive f << EOF | 277 $ hg revert --interactive f << EOF |
266 > y | 278 > y |
279 > ? | |
267 > y | 280 > y |
268 > n | 281 > n |
269 > n | 282 > n |
270 > EOF | 283 > EOF |
271 diff --git a/f b/f | 284 diff --git a/f b/f |
277 1 | 290 1 |
278 2 | 291 2 |
279 3 | 292 3 |
280 4 | 293 4 |
281 5 | 294 5 |
295 discard change 1/2 to 'f'? [Ynesfdaq?] ? | |
296 | |
297 y - yes, discard this change | |
298 n - no, skip this change | |
299 e - edit this change manually | |
300 s - skip remaining changes to this file | |
301 f - discard remaining changes to this file | |
302 d - done, skip remaining changes and files | |
303 a - discard all changes to all remaining files | |
304 q - quit, discarding no changes | |
305 ? - ? (display help) | |
282 discard change 1/2 to 'f'? [Ynesfdaq?] y | 306 discard change 1/2 to 'f'? [Ynesfdaq?] y |
283 | 307 |
284 @@ -2,6 +1,5 @@ | 308 @@ -2,6 +1,5 @@ |
285 1 | 309 1 |
286 2 | 310 2 |
434 > EOF | 458 > EOF |
435 forgetting newfile | 459 forgetting newfile |
436 forget added file newfile (Yn)? y | 460 forget added file newfile (Yn)? y |
437 $ hg status | 461 $ hg status |
438 ? newfile | 462 ? newfile |
439 |