comparison tests/test-tags.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 719cf07b076d
children dbdce3b99988
comparison
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
1 unknown 1 unknown
2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 0acdaf898367 tip 3 0acdaf898367 tip
3 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first 4 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first
4 tip 1:8a3ca90d111dc784e6575d373105be12570e8776 5 tip 1:8a3ca90d111dc784e6575d373105be12570e8776
5 first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4 6 first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
6 8a3ca90d111d tip 7 8a3ca90d111d tip
7 M a 8 M a
8 8a3ca90d111d+ tip 9 8a3ca90d111d+ tip
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9 0acdaf898367+ first 11 0acdaf898367+ first
10 0acdaf8983679e0aac16e811534eb49d7ee1f2b4+ first 12 0acdaf8983679e0aac16e811534eb49d7ee1f2b4+ first
11 M a 13 M a
12 8216907a933d tip 14 8216907a933d tip
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 (branch merge, don't forget to commit)
13 8216907a933d+8a3ca90d111d+ tip 17 8216907a933d+8a3ca90d111d+ tip
14 M .hgtags 18 M .hgtags
15 .hgtags:2: ignoring invalid tag 19 .hgtags:2: ignoring invalid tag
16 .hgtags:4: ignoring invalid tag 20 .hgtags:4: ignoring invalid tag
17 localtags:1: ignoring invalid tag 21 localtags:1: ignoring invalid tag