view tests/test-issue322.out @ 5260:be4835ad9a85

convert: new config variable hg.tagsbranch controls which branch tags are committed to
author Brendan Cully <brendan@kublai.com>
date Mon, 27 Aug 2007 15:39:07 -0700
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