annotate tests/test-issue322.out @ 4363:c6413f8f2f8e
Use python instead of shell printf with \x for test-simplemerge-cmd
Needed e.g. to be compatible with Solaris.
author |
Thomas Arendsen Hein <thomas@intevation.de> |
date |
Thu, 19 Apr 2007 12:47:55 +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
|