Mercurial > hg > mercurial-crew

view tests/test-issue322.out @ 10384:832f35386067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import: import each patch in a file or stream as a separate change Supports hg export <revrange>, mail messages, and mailboxes. Does not support multiple patches in a single MIME attachment. Closes issue167.
author Brendan Cully <brendan@kublai.com>
date Sun, 07 Feb 2010 18:06:52 +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