Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue322.out @ 3233:3fd098e0902d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: extend file merge function for renames
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 12:04:48 -0500
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