tests/test-issue322.out
author Matt Mackall <mpm@selenic.com>
Tue, 17 Oct 2006 18:54:37 -0500
changeset 3436 357b5589dc62
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