> On 2 Mar 2021, at 05:10, Michael Orlitzky <m...@gentoo.org> wrote: > > On Mon, 2021-03-01 at 22:54 -0500, Matt Turner wrote: >> tl;dr: In app-portage/gentoolkit-0.5.1 there's a new tool I wrote, >> called merge-driver-ekeyword that can automatically resolve git merge >> conflicts involving the KEYWORDS=... line in ebuilds. >> >> Since the KEYWORDS=... assignment is a single line, > > Is that enforced? If not, will the merge driver handle other formats > correctly? And if it is... why don't we just enforce putting each > keyword on a separate line instead, so that we don't have this problem > in the first place?
Yeah, it’s policy: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105. I also removed all of the trivial infringers not long ago: https://github.com/gentoo/gentoo/pull/19467. There aren’t many left. Anyway, yes, the format is still a pain because diff doesn’t handle it well. But I don’t really want to see ebuilds become longer... sam
signature.asc
Description: Message signed with OpenPGP
