comparison tests/test-revert.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.

2174:3044a3fdae76

%% should verbosely save backup to e.orig
saving current version of e as e.orig
reverting e
resolving manifests
getting e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
%% should say no changes needed
no changes needed to a
%% should say file not managed
file not managed: q
%% should say file not found

forgetting z
%% should forget a
forgetting a
%% should silently add a
A a
reverting c
%% should print non-executable
non-executable
reverting c
%% should print executable

2175:b2ae81a7df29

%% 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

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