tests/test-issue322.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 07 Sep 2006 14:12:39 +0200
changeset 3063 035fd2029575
parent 2953 3d5547845158
child 5051 e3dffbdc6522
permissions -rw-r--r--
git --diff: fix traceback when getting mode change - use the manifest instead of the mode in the working dir if the diff is against two revisions - add a testcase

% 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