Mercurial > hg

view tests/test-confused-revert.out @ 1738:f293ad87f928

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't hard-code /tmp in test-ro-message This makes the test succeed when $TMPDIR is set.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 17 Feb 2006 17:41:18 -0600
parents 30146be3437c
children d436b21b20dc
line wrap: on
line source

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