comparison tests/test-filebranch.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
comparison
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
1 creating base 1 creating base
2 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 creating branch a 3 creating branch a
3 creating branch b 4 creating branch b
4 we shouldn't have anything but n state here 5 we shouldn't have anything but n state here
5 n 644 2 bar 6 n 644 2 bar
6 n 644 3 baz 7 n 644 3 baz