{"thread":{"id":"1010","subject":"[PATCH 1/2] A test case that demonstrates a problem with merges with two roots.","startedAt":"2005-06-23T02:01:09Z","lastAt":"2005-06-23T02:01:09Z","messageCount":1,"participants":["Jon Seymour"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"5148","messageId":"20050623020109.16402.qmail@blackcubes.dyndns.org","threadId":"1010","inReplyTo":null,"subject":"[PATCH 1/2] A test case that demonstrates a problem with merges with two roots.","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2005-06-23T02:01:09Z","receivedAt":"2005-06-23T02:01:09Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"\ngit-rev-list --merge-order is omitting one of the roots when\ndisplaying a merge containing two distinct roots.\n\nA subsequent patch will fix the problem.\n\nSigned-off-by: Jon Seymour <jon.seymour@gmail.com>\n---\n\n t/t6001-rev-list-merge-order.sh |   61 +++++++++++++++++++++++++++++++++++++++\n 1 files changed, 61 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh\nold mode 100644\nnew mode 100755\n--- a/t/t6001-rev-list-merge-order.sh\n+++ b/t/t6001-rev-list-merge-order.sh\n@@ -172,6 +172,13 @@ on_committer_date \"1971-08-16 00:00:17\" \n on_committer_date \"1971-08-16 00:00:18\" save_tag l5 unique_commit l5 tree -p l4\n on_committer_date \"1971-08-16 00:00:19\" save_tag m1 unique_commit m1 tree -p a4 -p c3\n on_committer_date \"1971-08-16 00:00:20\" save_tag m2 unique_commit m2 tree -p c3 -p a4\n+on_committer_date \"1971-08-16 00:00:21\" hide_error save_tag alt_root unique_commit alt_root tree\n+on_committer_date \"1971-08-16 00:00:22\" save_tag r0 unique_commit r0 tree -p alt_root\n+on_committer_date \"1971-08-16 00:00:23\" save_tag r1 unique_commit r1 tree -p r0\n+on_committer_date \"1971-08-16 00:00:24\" save_tag l5r1 unique_commit l5r1 tree -p l5 -p r1\n+on_committer_date \"1971-08-16 00:00:25\" save_tag r1l5 unique_commit r1l5 tree -p r1 -p l5\n+\n+\n #\n # note: as of 20/6, it isn't possible to create duplicate parents, so this\n # can't be tested.\n@@ -483,6 +490,60 @@ EOF\n \n test_expect_success \"head ^head no --merge-order\" 'git-rev-list a3 ^a3' <<EOF\n EOF\n+\n+test_output_expect_success 'simple merge order (l5r1)' 'git-rev-list --merge-order --show-breaks l5r1' <<EOF\n+= l5r1\n+| r1\n+| r0\n+| alt_root\n+^ l5\n+| l4\n+| l3\n+| a4\n+| c3\n+| c2\n+| c1\n+^ b4\n+| b3\n+| b2\n+| b1\n+^ a3\n+| a2\n+| a1\n+| a0\n+| l2\n+| l1\n+| l0\n+= root\n+EOF\n+\n+test_output_expect_success 'simple merge order (r1l5)' 'git-rev-list --merge-order --show-breaks r1l5' <<EOF\n+= r1l5\n+| l5\n+| l4\n+| l3\n+| a4\n+| c3\n+| c2\n+| c1\n+^ b4\n+| b3\n+| b2\n+| b1\n+^ a3\n+| a2\n+| a1\n+| a0\n+| l2\n+| l1\n+| l0\n+| root\n+^ r1\n+| r0\n+= alt_root\n+EOF\n+\n+\n #\n #\n \n------------\n"}]}