Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-issue322.out @ 3814:bcdab0b2a6f5
Merge with mpm
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 06 Dec 2006 13:27:39 -0800 |
parents | 3d5547845158 |
children | e3dffbdc6522 |
rev | line source |
---|---|
2953 | 1 % file replaced with directory |
2 adding a | |
3 % should fail - would corrupt dirstate | |
4 abort: file named 'a' already in dirstate | |
5 % directory replaced with file | |
6 adding a/a | |
7 % should fail - would corrupt dirstate | |
8 abort: directory named 'a' already in dirstate | |
9 % directory replaced with file | |
10 adding b/c/d | |
11 % should fail - would corrupt dirstate | |
12 abort: directory named 'b' already in dirstate |