Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue322.out @ 4259:bda63383d529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make import opportunistically use merge information
author Brendan Cully <brendan@kublai.com>
date Wed, 21 Mar 2007 14:06:25 -0700
parents 3d5547845158
children e3dffbdc6522
line wrap: on
line source

% 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