bin/merge-driver-ekeyword: Look for KEYWORDS changes in upstream commit #48
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thesamesam
approved these changes
May 25, 2024
Fixes: 1a2c70d ("Run `pyupgrade --py39-plus`") Signed-off-by: Matt Turner <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
Previously we only looked for changes to the KEYWORDS= line in our local
commit being rebased. If it contained no changes to KEYWORDS= then the
merge-driver gave up.
However our local patch may conflict with an upstream patch that changed
KEYWORDS.
In that case, we can look for changes to the KEYWORDS= line in the other
patch and try to apply its change to ours.
This happened in gentoo.git commits
2c5cd6c4e004 ("sys-fs/squashfs-tools-ng: Stabilize 1.3.0 amd64, #930693")
7129c2e4e5f3 ("sys-fs/squashfs-tools-ng: run elibtoolize in non-live ebuild")
leading to a rebase mistake in the latter (later fixed by commit
7579afbd4aa1 ("sys-fs/squashfs-tools-ng: stabilize 1.3.0 for amd64")).
With this patch applied, the merge conflicts are automatically resolved
between the two commits regardless of which is "ours" vs "theirs".
Signed-off-by: Matt Turner <[email protected]>
mattst88
force-pushed
the
better-merge-driver
branch
from
9be3722
to
a667d93
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously we only looked for changes to the KEYWORDS= line in our local commit being rebased. If it contained no changes to KEYWORDS= then the merge-driver gave up.
However our local patch may conflict with an upstream patch that changed KEYWORDS.
In that case, we can look for changes to the KEYWORDS= line in the other patch and try to apply its change to ours.
This happened in gentoo.git commits
2c5cd6c4e004 ("sys-fs/squashfs-tools-ng: Stabilize 1.3.0 amd64, #930693")7129c2e4e5f3 ("sys-fs/squashfs-tools-ng: run elibtoolize in non-live ebuild")leading to a rebase mistake in the latter (later fixed by commit
7579afbd4aa1 ("sys-fs/squashfs-tools-ng: stabilize 1.3.0 for amd64")).With this patch applied, the merge conflicts are automatically resolved between the two commits regardless of which is "ours" vs "theirs".