Skip to content

merge_driver_ekeyword: Add test for merging commits that touch the same keyword #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattst88 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

merge_driver_ekeyword: Add test for merging commits that touch the same keyword #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pym/gentoolkit/merge_driver_ekeyword/tests/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
19 changes: 19 additions & 0 deletions pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/A.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
19 changes: 19 additions & 0 deletions pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/B.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
19 changes: 19 additions & 0 deletions pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/common-ancestor.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
19 changes: 19 additions & 0 deletions pym/gentoolkit/merge_driver_ekeyword/tests/same-keyword-conflict/expected.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"