Gentoo Archives: gentoo-dev

From: hasufell <hasufell@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] Developer branches on proj/gentoo
Date: Tue, 11 Aug 2015 14:12:42
Message-Id: 55CA02CD.9050309@gentoo.org
In Reply to: [gentoo-dev] Developer branches on proj/gentoo by Patrice Clement
1 On 08/11/2015 03:52 PM, Patrice Clement wrote:
2 > Hi there
3 >
4 > According to https://wiki.gentoo.org/wiki/Gentoo_git_workflow#Branching_Model,
5 > "there may be developer-specific, task-specific, project-specific branches
6 > etc". As far as I understand, it means I can go and create my own branch on the
7 > main repository and push it and it gets spread all over the place. Is that
8 > correct?
9 >
10 > Could someone explain to me the rationale behind this decision?
11 >
12 > Truth to be told, I kinda dislike the fact any developer can do this.
13 >
14 > proj/gentoo should be kept for "serious business" i.e. commits that affects the
15 > tree. On the long run, if everybody goes down that road, we will see flourish
16 > numerous branches (who said unmaintained?), all stalled at a different state of
17 > the main repo, and it will only generate a lot of noise and confusion for
18 > nothing. Further, since we've moved over to git, the main tree now gets
19 > replicated to github and we all have github accounts here, don't we? Which makes
20 > the whole forking and submitting PRs a cinch.
21 >
22 > If a developer wants to tinker with the tree, he can fork it to its github
23 > devspace, fiddle around, and later on send us a PR back with his changes to
24 > merge.
25 >
26
27 Branches can still make sense, even if the model is that everyone has
28 his own fork, see
29 http://nvie.com/posts/a-successful-git-branching-model/
30 for an example.
31
32 I currently don't see a reason to limit the workflow to one master branch.
33
34 It doesn't necessarily generate noise or confusion and there are various
35 ways to only fetch specific branches if you really need to do so. Git's
36 main advantage _are_ branches and it has sufficient methods to deal with
37 a lot of them.
38
39 If they cause trouble, we can still prune them and enforce stricter
40 rules, but since we don't even know how they will be used, this point is
41 moot yet.

Replies

Subject Author
Re: [gentoo-dev] Developer branches on proj/gentoo William Hubbs <williamh@g.o>