Dnia 2014-09-18, o godz. 19:39:08 Tobias Klausmann <klaus...@gentoo.org> napisał(a):
> Since we're causing at least mild upheaval process-wise, I > thought I'd bring up a topic that will be exacerbated by the git > migration if it's not really addressed. > > AIUI, we try to avoid merge conflicts, unless the merge is a > meaningful integration of divergent processes. > > However, one aspect of how ebuilds are written these days will > cause a non-trivial amount of merge commits that are not actually > useful in that sense. > > This is due to the way keywording and stabilization work on an > ebuild level. Since keywords are all in one line, any merge tool > will barf on two keywords being changed in disparate clones. I.e. > if I change ~alpha->alpha while someone else changes > ~amd64->amd64, we will have a merge conflict. If someone stabilizes the package you have edited, then most likely you actually want to edit your commits and move the changes to a revbump. If at all, I'd be more worried by a case when queued version bumps would lose keywords that were added in the meantime to older versions. -- Best regards, Michał Górny
signature.asc
Description: PGP signature
