author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
Thu, 05 Nov 2009 15:19:54 +0100 | |
changeset 9722 | 4d9dea174b84 |
parent 5051 | e3dffbdc6522 |
permissions | -rw-r--r-- |
2953 | 1 |
% file replaced with directory |
2 |
adding a |
|
3 |
% should fail - would corrupt dirstate |
|
5051
e3dffbdc6522
update tests output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2953
diff
changeset
|
4 |
abort: file 'a' in dirstate clashes with 'a/a' |
2953 | 5 |
% directory replaced with file |
6 |
adding a/a |
|
7 |
% should fail - would corrupt dirstate |
|
5051
e3dffbdc6522
update tests output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2953
diff
changeset
|
8 |
abort: directory 'a' already in dirstate |
2953 | 9 |
% directory replaced with file |
10 |
adding b/c/d |
|
11 |
% should fail - would corrupt dirstate |
|
5051
e3dffbdc6522
update tests output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2953
diff
changeset
|
12 |
abort: directory 'b' already in dirstate |