Mercurial > hg > pyhgsh
comparison tests/test-confused-revert.out @ 2175:b2ae81a7df29
Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
with the exception of backout --merge)
Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved
Inform the user what to do after a merge:
(branch merge, don't forget to commit)
Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
hg update -C X
hg merge Y
Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 02 May 2006 18:44:02 +0200 |
| parents | 968f036f93a4 |
| children | 6c6c0e5595a2 |
comparison
equal
deleted
inserted
replaced
| 2174:3044a3fdae76 | 2175:b2ae81a7df29 |
|---|---|
| 4 reverting... | 4 reverting... |
| 5 undeleting a | 5 undeleting a |
| 6 forgetting b | 6 forgetting b |
| 7 %%% should show b unknown and a back to normal | 7 %%% should show b unknown and a back to normal |
| 8 ? b | 8 ? b |
| 9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 9 merging a | 11 merging a |
| 12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 13 (branch merge, don't forget to commit) | |
| 10 %%% should show foo-b | 14 %%% should show foo-b |
| 11 foo-b | 15 foo-b |
| 12 %%% should show a removed and b added | 16 %%% should show a removed and b added |
| 13 A b | 17 A b |
| 14 R a | 18 R a |