[PATCHv2 1/2] add basic tests for merge-tree

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Will Palmer <wmpalmer@gmail.com>
To: git@vger.kernel.org
Cc: wmpalmer@gmail.com, gitster@pobox.com
Subject: [PATCHv2 1/2] add basic tests for merge-tree
Date: Sun, 11 Jul 2010 14:16:54 +0100	[thread overview]
Message-ID: <1278854215-9022-2-git-send-email-wmpalmer@gmail.com> (raw)
In-Reply-To: <1278854215-9022-1-git-send-email-wmpalmer@gmail.com>

merge-tree had no test cases, so here we add some very basic tests for
it, including some known-breakages.

Signed-off-by: Will Palmer <wmpalmer@gmail.com>
---
 t/t4300-merge-tree.sh |  277 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 277 insertions(+), 0 deletions(-)
 create mode 100755 t/t4300-merge-tree.sh

diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
new file mode 100755
index 0000000..b2ae3a1
--- /dev/null
+++ b/t/t4300-merge-tree.sh
@@ -0,0 +1,277 @@
+#!/bin/sh
+#
+# Copyright (c) 2010 Will Palmer
+#
+
+test_description='git merge-tree'
+. ./test-lib.sh
+
+test_expect_success setup '
+	test_commit "initial" "initial-file" "initial"
+'
+
+test_expect_'file add A, !B' '
+	cat >expected <<EXPECTED
+added in remote
+  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+@@ -0,0 +1 @@
++AAA
+EXPECTED
+
+	git reset --hard initial
+	test_commit "add-a-not-b" "ONE" "AAA"
+
+	git merge-tree initial initial add-a-not-b >actual &&
+	test_cmp expected actual
+'
+
+test_expect_failure 'file add !A, B' '
+	cat >expected <<EXPECTED
+added in local
+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+EXPECTED
+
+	git reset --hard initial
+	test_commit "add-not-a-b" "ONE" "AAA"
+
+	git merge-tree initial add-not-a-b initial >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'file add A, B (same)' '
+	cat >expected <<EXPECTED
+added in both
+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+EXPECTED
+
+	git reset --hard initial
+	test_commit "add-a-b-same-A" "ONE" "AAA"
+
+	git reset --hard initial
+	test_commit "add-a-b-same-B" "ONE" "AAA"
+
+	git merge-tree initial add-a-b-same-A add-a-b-same-B >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'file add A, B (different)' '
+	cat >expected <<EXPECTED
+added in both
+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
+@@ -1 +1,5 @@
++<<<<<<< .our
+ AAA
++=======
++BBB
++>>>>>>> .their
+EXPECTED
+
+	git reset --hard initial
+	test_commit "add-a-b-diff-A" "ONE" "AAA"
+
+	git reset --hard initial
+	test_commit "add-a-b-diff-B" "ONE" "BBB"
+
+	git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'file change A, !B' '
+	cat >expected <<EXPECTED
+EXPECTED
+
+	git reset --hard initial
+	test_commit "change-a-not-b" "initial-file" "BBB"
+
+	git merge-tree initial change-a-not-b initial >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'file change !A, B' '
+	cat >expected <<EXPECTED
+merged
+  result 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
+  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+@@ -1 +1 @@
+-initial
++BBB
+EXPECTED
+	git reset --hard initial
+	test_commit "change-not-a-b" "initial-file" "BBB"
+
+	git merge-tree initial initial change-not-a-b >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'file change A, B (same)' '
+	cat >expected <<EXPECTED
+EXPECTED
+
+	git reset --hard initial
+	test_commit "change-a-b-same-A" "initial-file" "AAA"
+
+	git reset --hard initial
+	test_commit "change-a-b-same-B" "initial-file" "AAA"
+
+	git merge-tree initial change-a-b-same-A change-a-b-same-B >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'file change A, B (different)' '
+	cat >expected <<EXPECTED
+changed in both
+  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d initial-file
+  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
+@@ -1 +1,5 @@
++<<<<<<< .our
+ AAA
++=======
++BBB
++>>>>>>> .their
+EXPECTED
+
+	git reset --hard initial
+	test_commit "change-a-b-diff-A" "initial-file" "AAA"
+
+	git reset --hard initial
+	test_commit "change-a-b-diff-B" "initial-file" "BBB"
+
+	git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'file change A, B (mixed)' '
+	cat >expected <<EXPECTED
+changed in both
+  base   100644 f4f1f998c7776568c4ff38f516d77fef9399b5a7 ONE
+  our    100644 af14c2c3475337c73759d561ef70b59e5c731176 ONE
+  their  100644 372d761493f524d44d59bd24700c3bdf914c973c ONE
+@@ -7,7 +7,11 @@
+ AAA
+ AAA
+ AAA
++<<<<<<< .our
+ BBB
++=======
++CCC
++>>>>>>> .their
+ AAA
+ AAA
+ AAA
+EXPECTED
+
+	git reset --hard initial
+	test_commit "change-a-b-mix-base" "ONE" "
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA"
+
+	test_commit "change-a-b-mix-A" "ONE" \
+		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/BBB/;}" <ONE)"
+
+	git reset --hard change-a-b-mix-base
+	test_commit "change-a-b-mix-B" "ONE" \
+		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/CCC/;}" <ONE)"
+
+	git merge-tree change-a-b-mix-base change-a-b-mix-A change-a-b-mix-B >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'file remove A, !B' '
+	cat >expected <<EXPECTED
+removed in local
+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+EXPECTED
+
+	git reset --hard initial
+	test_commit "rm-a-not-b-base" "ONE" "AAA"
+
+	git rm ONE
+	git commit -m "rm-a-not-b"
+	git tag "rm-a-not-b"
+
+	git merge-tree rm-a-not-b-base rm-a-not-b rm-a-not-b-base >actual &&
+	test_cmp expected actual
+'
+
+test_expect_failure 'file remove !A, B' '
+	cat >expected <<EXPECTED
+removed in remote
+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+@@ -1 +0,0 @@
+-AAA
+EXPECTED
+
+	git reset --hard initial
+	test_commit "rm-not-a-b-base" "ONE" "AAA"
+
+	git rm ONE
+	git commit -m "rm-not-a-b"
+	git tag "rm-not-a-b"
+
+	git merge-tree rm-a-not-b-base rm-a-not-b-base rm-a-not-b >actual &&
+	test_cmp expected actual
+'
+
+test_expect_failure 'file change A, remove B' '
+	cat >expected <<EXPECTED
+removed in remote
+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  our    100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
+@@ -1 +0,0 @@
+-BBB
+EXPECTED
+
+	git reset --hard initial
+	test_commit "change-a-rm-b-base" "ONE" "AAA"
+
+	test_commit "change-a-rm-b-A" "ONE" "BBB"
+
+	git reset --hard change-a-rm-b-base
+	git rm ONE
+	git commit -m "change-a-rm-b-B"
+	git tag "change-a-rm-b-B"
+
+	git merge-tree change-a-rm-b-base change-a-rm-b-A change-a-rm-b-B >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'file remove A, change B' '
+	cat >expected <<EXPECTED
+removed in local
+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
+EXPECTED
+
+	git reset --hard initial
+	test_commit "rm-a-change-b-base" "ONE" "AAA"
+
+	git rm ONE
+	git commit -m "rm-a-change-b-A"
+	git tag "rm-a-change-b-A"
+
+	git reset --hard rm-a-change-b-base
+	test_commit "rm-a-change-b-B" "ONE" "BBB"
+
+	git merge-tree rm-a-change-b-base rm-a-change-b-A rm-a-change-b-B >actual &&
+	test_cmp expected actual
+'
+
+test_done
-- 
1.7.1.703.g42c01

next prev parent reply	other threads:[~2010-07-11 13:17 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-11 13:16 [PATCHv2 0/2] merge-tree: fix (merge-base a b) b a Will Palmer
2010-07-11 13:16 ` Will Palmer [this message]
2010-07-13 23:31   ` [PATCHv2 1/2] add basic tests for merge-tree Junio C Hamano
2010-07-14  7:01     ` Will Palmer
2010-07-14 16:26       ` Junio C Hamano
2010-07-11 13:16 ` [PATCHv2 2/2] fix merge-tree where two branches share no changes Will Palmer

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b2ae3a1 )
 OR (
bs:"[PATCHv2 1/2] add basic tests for merge-tree" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1278854215-9022-2-git-send-email-wmpalmer@gmail.com \
    --to=wmpalmer@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.