tests/test-issue322.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 08 Dec 2006 07:48:47 +0100
changeset 3826 ed5a9b27bedc
parent 2953 3d5547845158
child 5051 e3dffbdc6522
permissions -rw-r--r--
merge with main

% 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