Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-excessive-merge.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 | 8feb33c2d153 |
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, 0 files removed, 0 files unresolved | |
3 (branch merge, don't forget to commit) | |
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6 (branch merge, don't forget to commit) | |
1 changeset: 4:f6c172c6198c | 7 changeset: 4:f6c172c6198c |
2 tag: tip | 8 tag: tip |
3 parent: 1:448a8c5e42f1 | 9 parent: 1:448a8c5e42f1 |
4 parent: 2:7c5dc2e857f2 | 10 parent: 2:7c5dc2e857f2 |
5 user: test | 11 user: test |