Mercurial > hg
comparison tests/test-confused-revert.t @ 39405:cb70501d8b71
revert: fix the inconsistency of status msgs in --interactive mode
Before this patch we were priting every action msg before actually
performing that action and that was resulting in inconsistencies;
like in --interactive session if user decided to not revert any
changes in a file foo, still there will be a msg on console saying
"reverting foo".
To fix this, I have made some changes to print status msg just
before the action it is going to perform, no matter if --interactive
or not.
Changes made in test-revert-interactive.t reflect the changed behavior.
There are also some changes in test-revert.t because of change in the
order of messages.
Differential Revision: https://phab.mercurial-scm.org/D4380
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 31 Aug 2018 23:28:09 +0530 |
parents | fc1d75e7a98d |
children | 8d72e29ad1e0 |
comparison
equal
deleted
inserted
replaced
39404:90afd61ef8a2 | 39405:cb70501d8b71 |
---|---|
12 $ hg status | 12 $ hg status |
13 A b | 13 A b |
14 R a | 14 R a |
15 | 15 |
16 $ hg revert --all | 16 $ hg revert --all |
17 forgetting b | |
17 undeleting a | 18 undeleting a |
18 forgetting b | |
19 | 19 |
20 Should show b unknown and a back to normal: | 20 Should show b unknown and a back to normal: |
21 | 21 |
22 $ hg status | 22 $ hg status |
23 ? b | 23 ? b |
64 [255] | 64 [255] |
65 | 65 |
66 Revert should be ok now: | 66 Revert should be ok now: |
67 | 67 |
68 $ hg revert -r2 --all | 68 $ hg revert -r2 --all |
69 forgetting b | |
69 undeleting a | 70 undeleting a |
70 forgetting b | |
71 | 71 |
72 Should show b unknown and a marked modified (merged): | 72 Should show b unknown and a marked modified (merged): |
73 | 73 |
74 $ hg status | 74 $ hg status |
75 M a | 75 M a |