Mercurial > hg

view tests/test-issue322.out @ 12114:0a6b2e21bc86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: merge the two test-rename-dir-merge* into one
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Mon, 30 Aug 2010 13:55:57 +0900
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