tests/test-confused-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 01 Apr 2006 23:57:24 +0200
changeset 2035 107dc72880f8
parent 2030 8d9ec30d58bc
child 2036 c9226bcc288d
permissions -rw-r--r--
Make 'hg tags -q' only list tag names without revision numbers and hashes, and change bash_completion to use this.

%%% should show a removed and b added
A b
R a
reverting...
saving current version of b as b.orig
forgetting b
undeleting a
%%% should show b unknown and a back to normal
? b
? b.orig
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
? b.orig
reverting...
forgetting b
undeleting a
%%% should show b unknown and a marked modified (merged)
? b
? b.orig
%%% should show foo-b
foo-b