diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2024-05-23 19:23:23 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2024-05-24 23:44:14 -0400 |
| commit | a667d934de4e5980111fb0b4e3ecae19b477131f (patch) | |
| tree | 1b55c6b768d8a750778279dfbfe8cde3f240ac64 /pym | |
| parent | bin/merge-driver-ekeyword: Two blank lines after function def (diff) | |
| download | gentoolkit-master.tar.gz gentoolkit-master.tar.bz2 gentoolkit-master.zip | |
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 <mattst88@gentoo.org>
Diffstat (limited to 'pym')
0 files changed, 0 insertions, 0 deletions