tests/test-confused-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 21 Mar 2006 12:54:32 +0100
changeset 1984 df7436f439a0
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
Improved ui.edit(): - Use descriptive name for temporary file: hg-editor-*.txt - Don't import tempfile in the method, but use demandload() - Remove tempfile file even if editor aborts.

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