diff --git a/tests/test-convert-cvs-synthetic.t b/tests/test-convert-cvs-synthetic.t --- a/tests/test-convert-cvs-synthetic.t +++ b/tests/test-convert-cvs-synthetic.t @@ -140,32 +140,35 @@ convert to hg (#1) collecting CVS rlog 15 log entries creating changesets - 8 changeset entries + 9 changeset entries sorting... converting... - 7 add file1 on trunk - 6 add file2 - 5 add file3, file4 on branch v1_1 - 4 MERGE from v1_0: add file2 + 8 add file1 on trunk + 7 add file2 + 6 MERGE from v1_0: 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 2 add file6 on trunk post-v1_2 - 1 MERGE from v1_2: add file5 - 0 MERGE from HEAD: add file6 + 1 MERGE from HEAD: add file6 + 0 MERGE from v1_2: add file5 hg glog output (#1) $ hg -R proj.hg glog --template "{rev} {desc}\n" - o 7 MERGE from HEAD: add file6 + o 8 MERGE from v1_2: add file5 | - | o 6 MERGE from v1_2: add file5 + | o 7 MERGE from HEAD: add file6 | | - | o 5 add file6 on trunk post-v1_2 + o | 6 add file6 on trunk post-v1_2 | | - o | 4 add file5 on v1_2 - |/ - | o 3 MERGE from v1_0: add file2 + | o 5 add file5 on v1_2 | | - | o 2 add file3, file4 on branch v1_1 + | | o 4 add file3, file4 on branch v1_1 + | | | + o | | 3 file file3 was initially added on branch v1_1. + |/ / + | o 2 MERGE from v1_0: add file2 |/ | o 1 add file2 |/ @@ -184,32 +187,35 @@ convert to hg (#2: with merge detection) collecting CVS rlog 15 log entries creating changesets - 8 changeset entries + 9 changeset entries sorting... converting... - 7 add file1 on trunk - 6 add file2 - 5 add file3, file4 on branch v1_1 - 4 MERGE from v1_0: add file2 + 8 add file1 on trunk + 7 add file2 + 6 MERGE from v1_0: 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 2 add file6 on trunk post-v1_2 - 1 MERGE from v1_2: add file5 - 0 MERGE from HEAD: add file6 + 1 MERGE from HEAD: add file6 + 0 MERGE from v1_2: add file5 hg glog output (#2) $ hg -R proj.hg2 glog --template "{rev} {desc}\n" - o 7 MERGE from HEAD: add file6 + o 8 MERGE from v1_2: add file5 | - | o 6 MERGE from v1_2: add file5 + | o 7 MERGE from HEAD: add file6 | | - | o 5 add file6 on trunk post-v1_2 + o | 6 add file6 on trunk post-v1_2 | | - o | 4 add file5 on v1_2 - |/ - | o 3 MERGE from v1_0: add file2 + | o 5 add file5 on v1_2 | | - | o 2 add file3, file4 on branch v1_1 + | | o 4 add file3, file4 on branch v1_1 + | | | + o | | 3 file file3 was initially added on branch v1_1. + |/ / + | o 2 MERGE from v1_0: add file2 |/ | o 1 add file2 |/ diff --git a/tests/test-convert-cvs.t b/tests/test-convert-cvs.t --- a/tests/test-convert-cvs.t +++ b/tests/test-convert-cvs.t @@ -395,12 +395,11 @@ testing debugcvsps Author: * (glob) Branch: HEAD Tag: (none) - Branchpoints: branch Log: ci1 Members: - a:1.1->1.2 + b/c:1.2->1.3 --------------------- PatchSet 6 @@ -408,11 +407,12 @@ testing debugcvsps Author: * (glob) Branch: HEAD Tag: (none) + Branchpoints: branch Log: ci1 Members: - b/c:1.2->1.3 + a:1.1->1.2 --------------------- PatchSet 7