Gentoo Archives: gentoo-dev

From: Alexis Ballier <aballier@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] Developer branches on proj/gentoo
Date: Tue, 11 Aug 2015 15:06:03
Message-Id: 20150811170546.3f2a7e63@gentoo.org
In Reply to: Re: [gentoo-dev] Developer branches on proj/gentoo by "Anthony G. Basile"
1 On Tue, 11 Aug 2015 10:26:46 -0400
2 "Anthony G. Basile" <blueness@g.o> wrote:
3
4 > On 8/11/15 10:19 AM, hasufell wrote:
5 > > On 08/11/2015 04:10 PM, Alexis Ballier wrote:
6 > >> On Tue, 11 Aug 2015 16:01:05 +0200
7 > >> Michał Górny <mgorny@g.o> wrote:
8 > >>
9 > >>> Dnia 2015-08-11, o godz. 15:52:16
10 > >>> Patrice Clement <monsieurp@g.o> napisał(a):
11 > >>>
12 > >>>> Hi there
13 > >>>>
14 > >>>> According to
15 > >>>> https://wiki.gentoo.org/wiki/Gentoo_git_workflow#Branching_Model,
16 > >>>> "there may be developer-specific, task-specific, project-specific
17 > >>>> branches etc". As far as I understand, it means I can go and
18 > >>>> create my own branch on the main repository and push it and it
19 > >>>> gets spread all over the place. Is that correct?
20 > >>>>
21 > >>>> Could someone explain to me the rationale behind this decision?
22 > >>>>
23 > >>>> Truth to be told, I kinda dislike the fact any developer can do
24 > >>>> this.
25 > >>> As long as it's used with caution, I don't see a problem.
26 > >> Then we should define 'caution' I think :)
27 > >>
28 > >>
29 > I would not say "caution" so much as good judgment. The first
30 > example that came to mind was working with the profiles which crosses
31 > many directories and files. In the past when I did restructuring to
32 > the hardened profiles, I tested by using a branch of the hardened-dev
33 > overlay. It was annoying and I would do a bind mount over
34 > /usr/portage/profiles and had to rebase manually. A test branch of
35 > the the main tree which could get rebased and eventually merged back
36 > would make the workflow so much better. Another example was when we
37 > revitalized the selinux policies. There were hundreds of commits to
38 > be done. A branch here that got merged back would be ideal.
39
40
41 you probably did this before it happened, but a solution in the last
42 months could have been to fork gentoo-portage-rsync-mirror, merge it
43 back (or better: rebase onto it) from time to time, and do a squashed PR
44 that you can merge with mgorny's scripts.