Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-static-http.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 | d90a9d7c7d4d |
comparison
equal
deleted
inserted
replaced
2174:3044a3fdae76 | 2175:b2ae81a7df29 |
---|---|
10 requesting all changes | 10 requesting all changes |
11 adding changesets | 11 adding changesets |
12 adding manifests | 12 adding manifests |
13 adding file changes | 13 adding file changes |
14 added 1 changesets with 1 changes to 1 files | 14 added 1 changesets with 1 changes to 1 files |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
15 checking changesets | 16 checking changesets |
16 checking manifests | 17 checking manifests |
17 crosschecking files in changesets and manifests | 18 crosschecking files in changesets and manifests |
18 checking files | 19 checking files |
19 1 files, 1 changesets, 1 total revisions | 20 1 files, 1 changesets, 1 total revisions |