Mercurial > hg
comparison tests/test-merge-remove.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 | a3fd84f4fb38 |
| children | 7e99b02768ef |
comparison
equal
deleted
inserted
replaced
| 39404:90afd61ef8a2 | 39405:cb70501d8b71 |
|---|---|
| 67 | 67 |
| 68 Reverting foo1 and bar: | 68 Reverting foo1 and bar: |
| 69 | 69 |
| 70 $ hg revert -vr . foo1 bar | 70 $ hg revert -vr . foo1 bar |
| 71 saving current version of bar as bar.orig | 71 saving current version of bar as bar.orig |
| 72 saving current version of foo1 as foo1.orig | |
| 72 reverting bar | 73 reverting bar |
| 73 saving current version of foo1 as foo1.orig | |
| 74 reverting foo1 | 74 reverting foo1 |
| 75 | 75 |
| 76 $ hg debugstate --nodates | 76 $ hg debugstate --nodates |
| 77 n 0 -2 unset bar | 77 n 0 -2 unset bar |
| 78 n 0 -2 unset foo1 | 78 n 0 -2 unset foo1 |