tests/test-issue322.out
author Matt Mackall <mpm@selenic.com>
Mon, 02 Oct 2006 12:04:48 -0500
changeset 3233 3fd098e0902d
parent 2953 3d5547845158
child 5051 e3dffbdc6522
permissions -rw-r--r--
merge: extend file merge function for renames

% 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