tests/test-confused-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 27 Apr 2006 21:16:46 +0200
changeset 2142 8a1e2a9c7013
parent 2043 968f036f93a4
child 2175 b2ae81a7df29
permissions -rw-r--r--
Replaced 0 with REVLOGV0 where this meaning is used.

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