tests/test-confused-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 12 Mar 2006 20:34:09 +0100
changeset 1921 acce3f7e1779
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
Don't expand empty [paths] so later interpolation can do the right thing. Example: [paths] default = default-push = %(default)s

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