merge_driver_ekeyword: Add test for merging commits that touch the sa…

…me 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.

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',

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"

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"

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"

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"