tests/test-confused-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 30 Apr 2006 19:30:59 +0200
changeset 2164 cbd458228a96
parent 2043 968f036f93a4
child 2175 b2ae81a7df29
permissions -rw-r--r--
Applied $PWD fix (changeset 278f9b13c39a) to tests/test-hook, too.

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