tests/test-issue322.out
author Patrick Mezard <pmezard@gmail.com>
Thu, 21 Jun 2007 22:19:41 +0200
changeset 4673 d8442fc0da8d
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