Mercurial > hg
comparison tests/test-flags.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 | ced2d3620f95 |
children | 966632304dde 455109df3669 |
comparison
equal
deleted
inserted
replaced
2174:3044a3fdae76 | 2175:b2ae81a7df29 |
---|---|
3 adding changesets | 3 adding changesets |
4 adding manifests | 4 adding manifests |
5 adding file changes | 5 adding file changes |
6 added 1 changesets with 2 changes to 2 files | 6 added 1 changesets with 2 changes to 2 files |
7 (run 'hg update' to get a working copy) | 7 (run 'hg update' to get a working copy) |
8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 pulling from ../test2 | 9 pulling from ../test2 |
9 searching for changes | 10 searching for changes |
10 adding changesets | 11 adding changesets |
11 adding manifests | 12 adding manifests |
12 adding file changes | 13 adding file changes |