+++ /home/rupert/opencsw/mercurial/trunk/work/solaris10-i386/build-isa-pentium_pro/mercurial-2.6-rc/tests/test-convert-cvs-synthetic.t.err
@@ -144,8 +144,8 @@
sorting...
converting...
8 add file1 on trunk
- 7 add file2
- 6 MERGE from v1_0: add file2
+ 7 MERGE from v1_0: add file2
+ 6 add file2
5 file file3 was initially added on branch v1_1.
4 add file3, file4 on branch v1_1
3 add file5 on v1_2
@@ -168,9 +168,9 @@
| | |
o | | 3 file file3 was initially added on branch v1_1.
|/ /
- | o 2 MERGE from v1_0: add file2
- |/
- | o 1 add file2
+ +---o 2 add file2
+ | |
+ | o 1 MERGE from v1_0: add file2
|/
o 0 add file1 on trunk
@@ -191,8 +191,8 @@
sorting...
converting...
8 add file1 on trunk
- 7 add file2
- 6 MERGE from v1_0: add file2
+ 7 MERGE from v1_0: add file2
+ 6 add file2
5 file file3 was initially added on branch v1_1.
4 add file3, file4 on branch v1_1
3 add file5 on v1_2
@@ -215,9 +215,9 @@
| | |
o | | 3 file file3 was initially added on branch v1_1.
|/ /
- | o 2 MERGE from v1_0: add file2
- |/
- | o 1 add file2
+ +---o 2 add file2
+ | |
+ | o 1 MERGE from v1_0: add file2
|/
o 0 add file1 on trunk
ERROR: /home/rupert/opencsw/mercurial/trunk/work/solaris10-i386/build-isa-pentium_pro/mercurial-2.6-rc/tests/test-convert-cvs-synthetic.t output changed