tests/test-issue322.out
author Brendan Cully <brendan@kublai.com>
Mon, 13 Aug 2007 11:58:47 -0700
changeset 5154 ec24bfd852ab
parent 5051 e3dffbdc6522
permissions -rw-r--r--
imerge: simplify 1d5ebb0d366f

% file replaced with directory
adding a
% should fail - would corrupt dirstate
abort: file 'a' in dirstate clashes with 'a/a'
% directory replaced with file
adding a/a
% should fail - would corrupt dirstate
abort: directory 'a' already in dirstate
% directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
abort: directory 'b' already in dirstate