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.
%% should show b unknown
? b
%% should show b unknown and c modified
M c
? b
%% should show b added and c modified
M c
A b
%% should show a removed, b added and c modified
M c
A b
R a
%% should show b added, copy saved, and c modified
M c
A b
%% should show b unknown, and c modified
M c
? b
%% should show unknown: b
? b
%% should show a b c e
a
b
c
e
%% should verbosely save backup to e.orig
saving current version of e as e.orig
reverting e
resolving manifests
getting e
%% should say no changes needed
no changes needed to a
%% should say file not managed
file not managed: q
%% should say file not found
notfound: No such file in rev 095eacd0c0d7
A z
? b
? e.orig
%% should add a, forget z
adding a
forgetting z
%% should forget a
forgetting a
%% should silently add a
A a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
reverting c
%% should print non-executable
non-executable
reverting c
%% should print executable
executable