annotate tests/test-issue322.out @ 3004:31011730f9bd
merge: eliminate mw manifestdict, do everything with m1
author |
Matt Mackall <mpm@selenic.com> |
date |
Tue, 22 Aug 2006 17:26:44 -0500 |
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
|