Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue322.out @ 3163:a9e75b371315
merge: move partial filtering out of manifest merge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 26 Sep 2006 16:21:52 -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