[Swan-dev] a different git branching model for Libreswan

Matt Rogers mrogers at redhat.com
Thu Oct 30 22:30:04 EET 2014


On 10/30, Paul Wouters wrote:
> ><http://nvie.com/posts/a-successful-git-branching-model/>
> >In this one, master is sacred and seems to only include final
> >releases.
> 
> This is the model (and in fact the actual web page describing it) that
> we were trying to deploy. What I like about it is that most of the
> messy commits never sees the public light. Only good patch sets do.
> Having set that, we have a number of "abandoned" topic branches that
> might actually contain code we need, or incomplete topics that have
> become more work to merge into development/master branches than they
> are to start from scratch. We don't even have an itemised list of these.
> 
> >This would be fine as far as I'm concerned.  I prefer master to be
> >where development life is lived in an open-source project.
> 
> It would be good that people running "stable" software can git pull
> and don't see all the mess, so this model does try to do that and
> master becomes a clean tree with solid commits only. Developers can
> go dive into the deeper mess by checking out the development tree. It
> also forces all commits to be categorised as something.
> 
> Related, currently most of our bugfixes don't actually appear on our
> own tracker. And we neglect our bugtracker mostly. If we force commits
> to have bug numbers it forces a cleaning work method.
> 

I agree if we make better use of our bugzilla, with an entry for every feature
and release commit, then it would help us stick to this workflow. 

Matt


More information about the Swan-dev mailing list