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

2014-10-30 Thread Matt Rogers
On 10/30, Paul Wouters wrote: > > > >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 th

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

2014-10-30 Thread Paul Wouters
On Wed, 29 Oct 2014, D. Hugh Redelmeier wrote: Current model, as I understand it: == master is where everything goes. We make releases off the HEAD of master. When we wish to make a release, we freeze master to some extent, until the release can happen. Only t

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

2014-10-29 Thread Antony Antony
On Wed, Oct 29, 2014 at 02:09:43PM -0400, Matt Rogers wrote: > On 10/29, D. Hugh Redelmeier wrote: > > My suggested solution: release/freeze branches > > == > > > > We should never freeze master. > > > > When we want a freeze for a release, create a rel

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

2014-10-29 Thread Matt Rogers
On 10/29, D. Hugh Redelmeier wrote: > My suggested solution: release/freeze branches > == > > We should never freeze master. > > When we want a freeze for a release, create a release branch. > > Work continues on master. > > If something should be in

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

2014-10-29 Thread D. Hugh Redelmeier
Current model, as I understand it: == master is where everything goes. We make releases off the HEAD of master. When we wish to make a release, we freeze master to some extent, until the release can happen. Only things "important enough" break through the freez