tests/test-issue322.out
author Matt Mackall <mpm@selenic.com>
Sun, 15 Apr 2007 18:42:38 -0500
changeset 4346 c593e502f7fd
parent 2953 3d5547845158
child 5051 e3dffbdc6522
permissions -rw-r--r--
Merge with stable

% 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