tests/test-issue322.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 16:47:33 -0500
changeset 3108 3bd05ad67f45
parent 2953 3d5547845158
child 5051 e3dffbdc6522
permissions -rw-r--r--
merge: pull manifest checks and updates into separate functions

% 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