##// END OF EJS Templates
Make hg update more verbose by default (issue12)...
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.

File last commit:

r2175:b2ae81a7 default
r2175:b2ae81a7 default
Show More
test-revert.out
53 lines | 956 B | text/plain | TextLexer
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show b unknown
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 ? b
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show b unknown and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
? b
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show b added and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
A b
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show a removed, b added and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
A b
R a
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029 %% should show b added, copy saved, and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
A b
Thomas Arendsen Hein
Minor fix for revert: No need to make a backup when forgetting added files....
r2043 %% should show b unknown, and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
? b
Thomas Arendsen Hein
Minor fix for revert: No need to make a backup when forgetting added files....
r2043 %% should show unknown: b
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 ? b
Thomas Arendsen Hein
Minor fix for revert: No need to make a backup when forgetting added files....
r2043 %% should show a b c e
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 a
b
c
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029 e
Thomas Arendsen Hein
Don't abort when backup files already exist. Don't allow alternative names....
r2036 %% should verbosely save backup to e.orig
saving current version of e as e.orig
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029 reverting e
Thomas Arendsen Hein
Don't abort when backup files already exist. Don't allow alternative names....
r2036 resolving manifests
getting e
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029 %% should say no changes needed
no changes needed to a
%% should say file not managed
file not managed: q
%% should say file not found
Vadim Gelfer
small changes to revert command....
r2042 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
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Vadim Gelfer
make test-revert check executable bit.
r2157 reverting c
%% should print non-executable
non-executable
reverting c
%% should print executable
executable