Mercurial > hg > gitweb
comparison tests/test-encode.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 | 1945754e466b |
| children |
comparison
equal
deleted
inserted
replaced
| 2174:3044a3fdae76 | 2175:b2ae81a7df29 |
|---|---|
| 2 %% no changes | 2 %% no changes |
| 3 %% uncompressed contents in repo | 3 %% uncompressed contents in repo |
| 4 this is a test | 4 this is a test |
| 5 %% uncompress our working dir copy | 5 %% uncompress our working dir copy |
| 6 this is a test | 6 this is a test |
| 7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 7 %% uncompress our new working dir copy | 8 %% uncompress our new working dir copy |
| 8 this is a test | 9 this is a test |