view 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.

unknown
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0acdaf898367 tip
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first
tip                                1:8a3ca90d111dc784e6575d373105be12570e8776
first                              0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
8a3ca90d111d tip
M a
8a3ca90d111d+ tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0acdaf898367+ first
0acdaf8983679e0aac16e811534eb49d7ee1f2b4+ first
M a
8216907a933d tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
8216907a933d+8a3ca90d111d+ tip
M .hgtags
.hgtags:2: ignoring invalid tag
.hgtags:4: ignoring invalid tag
localtags:1: ignoring invalid tag
tip                                4:fd868a874787a7b5af31e1675666ce691c803035
first                              0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
changeset:   4:fd868a874787
.hgtags:2: ignoring invalid tag
.hgtags:4: ignoring invalid tag
localtags:1: ignoring invalid tag
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     tags