Mercurial > hg
comparison tests/test-clone.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 | 57729c56a23c |
| children | aaeb7f5d1052 |
comparison
equal
deleted
inserted
replaced
| 2174:3044a3fdae76 | 2175:b2ae81a7df29 |
|---|---|
| 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 1 a | 2 a |
| 2 checking changesets | 3 checking changesets |
| 3 checking manifests | 4 checking manifests |
| 4 crosschecking files in changesets and manifests | 5 crosschecking files in changesets and manifests |
| 5 checking files | 6 checking files |
| 8 checking changesets | 9 checking changesets |
| 9 checking manifests | 10 checking manifests |
| 10 crosschecking files in changesets and manifests | 11 crosschecking files in changesets and manifests |
| 11 checking files | 12 checking files |
| 12 1 files, 1 changesets, 1 total revisions | 13 1 files, 1 changesets, 1 total revisions |
| 14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 13 a | 15 a |