tests/test-issue322.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 27 Sep 2006 21:44:20 +0200
changeset 3182 f6c36cc92d02
parent 2953 3d5547845158
child 5051 e3dffbdc6522
permissions -rw-r--r--
Merge with crew

% file replaced with directory
adding a
% should fail - would corrupt dirstate
abort: file named 'a' already in dirstate
% directory replaced with file
adding a/a
% should fail - would corrupt dirstate
abort: directory named 'a' already in dirstate
% directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
abort: directory named 'b' already in dirstate