diff --git a/tests/test-excessive-merge.out b/tests/test-excessive-merge.out --- a/tests/test-excessive-merge.out +++ b/tests/test-excessive-merge.out @@ -1,40 +1,40 @@ -changeset: 4:2ee31f665a86 +changeset: 4:f6c172c6198c tag: tip -parent: 1:96155394af80 -parent: 2:92cc4c306b19 +parent: 1:448a8c5e42f1 +parent: 2:7c5dc2e857f2 user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: merge a/b -> blah -changeset: 3:e16a66a37edd -parent: 2:92cc4c306b19 -parent: 1:96155394af80 +changeset: 3:13d875a22764 +parent: 2:7c5dc2e857f2 +parent: 1:448a8c5e42f1 user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: merge b/a -> blah -changeset: 2:92cc4c306b19 -parent: 0:5e0375449e74 +changeset: 2:7c5dc2e857f2 +parent: 0:dc1751ec2e9d user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: branch b -changeset: 1:96155394af80 +changeset: 1:448a8c5e42f1 user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: branch a -changeset: 0:5e0375449e74 +changeset: 0:dc1751ec2e9d user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: test rev offset length base linkrev nodeid p1 p2 - 0 0 60 0 0 5e0375449e74 000000000000 000000000000 - 1 60 62 1 1 96155394af80 5e0375449e74 000000000000 - 2 122 62 2 2 92cc4c306b19 5e0375449e74 000000000000 - 3 184 69 3 3 e16a66a37edd 92cc4c306b19 96155394af80 - 4 253 29 3 4 2ee31f665a86 96155394af80 92cc4c306b19 + 0 0 64 0 0 dc1751ec2e9d 000000000000 000000000000 + 1 64 68 1 1 448a8c5e42f1 dc1751ec2e9d 000000000000 + 2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000 + 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 + 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 1 79d7492df40aa0fa093ec4209be78043c181f094 644 a