Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue322.out @ 5460:fe9b0bb3eb1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with goto
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 12 Oct 2007 11:23:03 +0200
parents e3dffbdc6522
children
line wrap: on
line source

% 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