{"thread":{"id":"14430","subject":"[PATCH] t6021: add a new test for git-merge-resolve","startedAt":"2008-07-12T18:42:10Z","lastAt":"2008-07-12T22:33:35Z","messageCount":2,"participants":["Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"83100","messageId":"1215888130-3260-1-git-send-email-vmiklos@frugalware.org","threadId":"14430","inReplyTo":null,"subject":"[PATCH] t6021: add a new test for git-merge-resolve","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-12T18:42:10Z","receivedAt":"2008-07-12T18:42:10Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"It should fail properly if there are multiple merge bases, but there\nwere no test for this till now.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n t/t6021-merge-criss-cross.sh |    4 ++++\n 1 files changed, 4 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh\nindex 0ab14a6..331b9b0 100755\n--- a/t/t6021-merge-criss-cross.sh\n+++ b/t/t6021-merge-criss-cross.sh\n@@ -89,4 +89,8 @@ EOF\n \n test_expect_success 'Criss-cross merge result' 'cmp file file-expect'\n \n+test_expect_success 'Criss-cross merge fails (-s resolve)' \\\n+'git reset --hard A^ &&\n+test_must_fail git merge -s resolve -m \"final merge\" B'\n+\n test_done\n-- \n1.5.6.2.450.g8d367.dirty\n"},{"id":"83109","messageId":"1215902015-5102-1-git-send-email-vmiklos@frugalware.org","threadId":"14430","inReplyTo":"1215888130-3260-1-git-send-email-vmiklos@frugalware.org","subject":"[PATCH] Add a new test for git-merge-resolve","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-12T22:33:35Z","receivedAt":"2008-07-12T22:33:35Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Actually this is a simple test, just to ensure merge-resolve properly\ncalls read-tree. read-tree itself already has more complex tests.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n\nThis one adds tests in a new file; it tests merge-resolve as well, just\nas my previous patch, but I though it's better if I just add the\nmultiple-base merge one to the end of the existing criss-cross tests.\n\nSo this is not a replacement, both are sent for inclusion.\n\n t/t7605-merge-resolve.sh |   46 ++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 46 insertions(+), 0 deletions(-)\n create mode 100755 t/t7605-merge-resolve.sh\n\ndiff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh\nnew file mode 100755\nindex 0000000..ee21a10\n--- /dev/null\n+++ b/t/t7605-merge-resolve.sh\n@@ -0,0 +1,46 @@\n+#!/bin/sh\n+\n+test_description='git-merge\n+\n+Testing the resolve strategy.'\n+\n+. ./test-lib.sh\n+\n+test_expect_success 'setup' '\n+\techo c0 > c0.c &&\n+\tgit add c0.c &&\n+\tgit commit -m c0 &&\n+\tgit tag c0 &&\n+\techo c1 > c1.c &&\n+\tgit add c1.c &&\n+\tgit commit -m c1 &&\n+\tgit tag c1 &&\n+\tgit reset --hard c0 &&\n+\techo c2 > c2.c &&\n+\tgit add c2.c &&\n+\tgit commit -m c2 &&\n+\tgit tag c2 &&\n+\tgit reset --hard c0 &&\n+\techo c3 > c2.c &&\n+\tgit add c2.c &&\n+\tgit commit -m c3 &&\n+\tgit tag c3\n+'\n+\n+test_expect_success 'merge c1 to c2' '\n+\tgit reset --hard c1 &&\n+\tgit merge -s resolve c2 &&\n+\ttest \"$(git rev-parse c1)\" != \"$(git rev-parse HEAD)\" &&\n+\ttest \"$(git rev-parse c1)\" = \"$(git rev-parse HEAD^1)\" &&\n+\ttest \"$(git rev-parse c2)\" = \"$(git rev-parse HEAD^2)\" &&\n+\tgit diff --exit-code &&\n+\ttest -f c0.c &&\n+\ttest -f c1.c &&\n+\ttest -f c2.c\n+'\n+\n+test_expect_success 'merge c2 to c3 (fails)' '\n+\tgit reset --hard c2 &&\n+\ttest_must_fail git merge -s resolve c3\n+'\n+test_done\n-- \n1.5.6.2.450.g8d367.dirty\n"}]}