Mercurial > hg > mercurial-source

view tests/test-issue322.out @ 9994:931d2c757627

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Henrik Stuart <hg@hstuart.dk>
date Thu, 03 Dec 2009 06:35:39 +0100
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