Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue322.out @ 4022:bf329bda51a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branchname changes in localrepo.commit.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 11 Jan 2007 23:13:32 +0100
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