tests/test-confused-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Apr 2006 21:01:33 +0200
changeset 2043 968f036f93a4
parent 2042 a514c7509fa9
child 2175 b2ae81a7df29
permissions -rw-r--r--
Minor fix for revert: No need to make a backup when forgetting added files. echo foo > foo && hg add foo && hg revert foo creates foo.orig, though foo is not changed or deleted.

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