Gentoo Archives: gentoo-dev

From: Michael Orlitzky <mjo@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=...
Date: Tue, 02 Mar 2021 20:12:29
Message-Id: f255d715dc9ef6be2174c8adbe680011c945fc7e.camel@gentoo.org
In Reply to: Re: [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=... by Matt Turner
1 On Tue, 2021-03-02 at 14:02 -0500, Matt Turner wrote:
2 > On Tue, Mar 2, 2021 at 12:11 AM Michael Orlitzky <mjo@g.o> wrote:
3 > > why don't we just enforce putting each
4 > > keyword on a separate line instead, so that we don't have this problem
5 > > in the first place?
6 >
7 > Why don't we change 30 thousand ebuilds rather than use this script?
8 >
9
10 If we're going to enforce a format, it makes more sense to sed things
11 into the easy format once than it does to leave things in the hard
12 format forever and maintain a custom tool that makes the hard format
13 more like the easy format.
14
15 With everything currently on one line, QA could easy change them all at
16 once in one big commit.

Replies