tests/test-confused-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 28 Apr 2006 11:36:33 +0200
changeset 2150 f15c6394d90d
parent 2043 968f036f93a4
child 2175 b2ae81a7df29
permissions -rw-r--r--
fix a NameError in changegroupsubset

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