Mercurial > hg
view tests/test-issue322.out @ 4819:9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 16:01:07 -0500 |
parents | 3d5547845158 |
children | e3dffbdc6522 |
line wrap: on
line source
% file replaced with directory adding a % should fail - would corrupt dirstate abort: file named 'a' already in dirstate % directory replaced with file adding a/a % should fail - would corrupt dirstate abort: directory named 'a' already in dirstate % directory replaced with file adding b/c/d % should fail - would corrupt dirstate abort: directory named 'b' already in dirstate