tests/test-confused-revert.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 17 Feb 2006 17:41:18 -0600
changeset 1738 f293ad87f928
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
Don't hard-code /tmp in test-ro-message This makes the test succeed when $TMPDIR is set.

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