Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue322.out @ 5340:ad8783fe20f7
darcs2hg: Now detects and recovers from simple darcs conflicts.
author | Terry Smith <terry@t11e.com> |
---|---|
date | Tue, 11 Sep 2007 13:13:54 -0400 |
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