tests/test-confused-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 02 Nov 2005 16:08:48 -0800
changeset 1488 08c7851969cc
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
only files in normal state should be marked as deleted fix a traceback when you removed an added file

%%% should show a removed and b added
A b
R a
reverting...
%%% 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...
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b