Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-revert2.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 | d436b21b20dc |
| children | ad6f34c83c3d |
line wrap: on
line diff
--- a/tests/test-merge-revert2.out +++ b/tests/test-merge-revert2.out @@ -1,14 +1,19 @@ 1:f248da0d4c3e 0:9eca13a34789 f248da0d4c3e tip +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 9eca13a34789 9eca13a34789+ reverting file1 9eca13a34789 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved f248da0d4c3e tip +1 files updated, 0 files merged, 0 files removed, 0 files unresolved merge: warning: conflicts during merge merging file1 merging file1 failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +There are unresolved merges with locally modified files. diff -r f248da0d4c3e file1 --- a/file1 +++ b/file1 @@ -25,4 +30,5 @@ f248da0d4c3e+ tip reverting file1 f248da0d4c3e tip f248da0d4c3e tip +0 files updated, 0 files merged, 0 files removed, 0 files unresolved f248da0d4c3e tip