{"thread":{"id":"1128","subject":"[PATCH 1/2] Add a t/t6001 test case for a --merge-order bug","startedAt":"2005-07-06T14:44:06Z","lastAt":"2005-07-06T14:44:06Z","messageCount":1,"participants":["Jon Seymour"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"5709","messageId":"20050706144406.17750.qmail@blackcubes.dyndns.org","threadId":"1128","inReplyTo":null,"subject":"[PATCH 1/2] Add a t/t6001 test case for a --merge-order bug","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2005-07-06T14:44:06Z","receivedAt":"2005-07-06T14:44:06Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"\nThis test case demonstrates a problem with --merge-order.\n\nA\n|\nB\n|\\\nC D\n|/\nE\n|\nF\n\ngit-rev-list --merge-order A B doesn't produce the expected output of\n\nA\nB\nD\nC\nE\nF\n\nSigned-off-by: Jon Seymour <jon.seymour@gmail.com>\n---\nThis patch is known designed to apply on top of:\n\n[PATCH 1/6] Temporary fixup to rev-list.c to restore expected order of arguments presented to --merge-order sort.\n[PATCH 2/6] Swap order of insert_by_date arguments\n[PATCH 3/6] Introduce struct rev_list_fns to rev-list.c to reduce amount of conditional processing.\n[PATCH 4/6] Add a topological sort procedure to commit.c [rev 4]\n[PATCH 5/6] Introduce --topo-order switch to git-rev-list\n[PATCH 6/6] Change gitk so that it uses --topo-order rather than --merge-order\n\nand \n\n[PATCH 1/3] Factor out useful test case infrastructure from t/t6001... into t/t6000-lib.sh\n[PATCH 2/3] Introduce unit tests for git-rev-list --bisect\n[PATCH 3/3] Change the sed seperator in t/t6000-lib.sh.\n\nA subsequent patch will fix the problem.\n---\n\n t/t6001-rev-list-merge-order.sh |   20 ++++++++++++++++++++\n 1 files changed, 20 insertions(+), 0 deletions(-)\n\n3c04d86fbc9310e823a6a46ac7bf295fda57c7b7\ndiff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh\n--- a/t/t6001-rev-list-merge-order.sh\n+++ b/t/t6001-rev-list-merge-order.sh\n@@ -438,6 +438,26 @@ a2\n a1\n EOF\n \n+test_output_expect_success \"--merge-order a4 l3\" \"git-rev-list --merge-order a4 l3\" <<EOF\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 #\n #\n \n------------\n"}]}