Mercurial > hg
view tests/test-issue322.out @ 9867:81f1462ef2c7
Allow import --no-commit over an applied MQ patch.
Since it only changes the working directory, it does not matter whether a patch is
applied. This change makes it easier to use hg import --no-commit instead of patch.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 16 Nov 2009 11:31:08 -0800 |
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