Mercurial > hg
comparison tests/test-push-r.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 | 4b0c9c674707 |
comparison
equal
deleted
inserted
replaced
2174:3044a3fdae76 | 2175:b2ae81a7df29 |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1 rev offset length base linkrev nodeid p1 p2 | 3 rev offset length base linkrev nodeid p1 p2 |
2 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | 4 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
3 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 | 5 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 |
4 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 | 6 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 |
5 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 | 7 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 |