tests/test-confused-revert.out
author Robin Farine <robin.farine@terminus.org>
Tue, 24 Jan 2006 13:59:01 +1300
changeset 1634 f49f602fae92
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
copy & rename can ignore removed source files As mercurial now distinguishes deleted files from removed files, we can skip removed source files while copying or renaming.

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