From f7042f33dbd08d455dbf90692e8cce6747aaa4c3 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Tue, 25 Jun 2024 13:11:02 -0400
Subject: [PATCH] merge_driver_ekeyword: Add test for merging commits that
 touch the same keyword

Unsure what the behavior should be. Currently the result depends on the
order of the commits being merged. maybe this is reasonable? Seems a bit
scary.
---
 .../merge_driver_ekeyword/tests/meson.build   |  4 ++++
 .../tests/same-keyword-conflict/A.ebuild      | 19 +++++++++++++++++++
 .../tests/same-keyword-conflict/B.ebuild      | 19 +++++++++++++++++++
 .../common-ancestor.ebuild                    | 19 +++++++++++++++++++
 .../same-keyword-conflict/expected.ebuild     | 19 +++++++++++++++++++
 5 files changed, 80 insertions(+)
 create mode 100644 pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/A.ebuild
 create mode 100644 pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/B.ebuild
 create mode 100644 pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/common-ancestor.ebuild
 create mode 100644 pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/expected.ebuild

diff --git a/pym/gentoolkit/merge_driver_ekeyword/tests/meson.build b/pym/gentoolkit/merge_driver_ekeyword/tests/meson.build
index cb7a9d56..f5e38e32 100644
--- a/pym/gentoolkit/merge_driver_ekeyword/tests/meson.build
+++ b/pym/gentoolkit/merge_driver_ekeyword/tests/meson.build
@@ -11,6 +11,10 @@ install_data(
 		'non-KEYWORDS-conflict/A.ebuild',
 		'non-KEYWORDS-conflict/B.ebuild',
 		'non-KEYWORDS-conflict/common-ancestor.ebuild',
+		'same-keyword-conflict/A.ebuild',
+		'same-keyword-conflict/B.ebuild',
+		'same-keyword-conflict/common-ancestor.ebuild',
+		'same-keyword-conflict/expected.ebuild',
 		'single-KEYWORDS-conflict/A.ebuild',
 		'single-KEYWORDS-conflict/B.ebuild',
 		'single-KEYWORDS-conflict/common-ancestor.ebuild',
diff --git a/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/A.ebuild b/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/A.ebuild
new file mode 100644
index 00000000..2216c3d3
--- /dev/null
+++ b/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/A.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="monitor system console messages with X"
+
+KEYWORDS="~alpha ~amd64 ~arm -arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/B.ebuild b/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/B.ebuild
new file mode 100644
index 00000000..1b5d4c46
--- /dev/null
+++ b/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/B.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="monitor system console messages with X"
+
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/common-ancestor.ebuild b/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/common-ancestor.ebuild
new file mode 100644
index 00000000..6f25981a
--- /dev/null
+++ b/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/common-ancestor.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="monitor system console messages with X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/expected.ebuild b/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/expected.ebuild
new file mode 100644
index 00000000..2216c3d3
--- /dev/null
+++ b/pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/expected.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="monitor system console messages with X"
+
+KEYWORDS="~alpha ~amd64 ~arm -arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"