Mercurial > hg

view tests/test-issue322.out @ 11981:518b90d66fad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-merge8
author Pradeepkumar Gayam <in3xes@gmail.com>
date Wed, 18 Aug 2010 05:55:56 +0530
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