Mercurial > hg-stable
comparison tests/test-issue322.out @ 5051:e3dffbdc6522
update tests output
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 02 Aug 2007 01:56:08 -0300 |
parents | 3d5547845158 |
children |
comparison
equal
deleted
inserted
replaced
5050:2bd996d0aaf8 | 5051:e3dffbdc6522 |
---|---|
1 % file replaced with directory | 1 % file replaced with directory |
2 adding a | 2 adding a |
3 % should fail - would corrupt dirstate | 3 % should fail - would corrupt dirstate |
4 abort: file named 'a' already in dirstate | 4 abort: file 'a' in dirstate clashes with 'a/a' |
5 % directory replaced with file | 5 % directory replaced with file |
6 adding a/a | 6 adding a/a |
7 % should fail - would corrupt dirstate | 7 % should fail - would corrupt dirstate |
8 abort: directory named 'a' already in dirstate | 8 abort: directory 'a' already in dirstate |
9 % directory replaced with file | 9 % directory replaced with file |
10 adding b/c/d | 10 adding b/c/d |
11 % should fail - would corrupt dirstate | 11 % should fail - would corrupt dirstate |
12 abort: directory named 'b' already in dirstate | 12 abort: directory 'b' already in dirstate |