annotate tests/test-issue322.out @ 3760:aeafd80c1e78
small fixes for test-newbranch
- hg tip doesn't use the branch cache; use hg log -r in its place
- commit doesn't use a HG_MERGE environment variable
- change the dates from "0 0" to "1000000 0"
| author |
Alexis S. L. Carvalho <alexis@cecm.usp.br> |
| date |
Sat, 02 Dec 2006 03:16:17 -0200 |
| 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
|
