[aerogear-dev] Maintenance branches

[Kris Borchers]

On Mar 22, 2013, at 10:18 AM, Summers Pittman <supittma at redhat.com> wrote:

> On 03/22/2013 11:16 AM, Douglas Campos wrote:
>> On 22/03/2013, at 09:32, Kris Borchers <kris at redhat.com> wrote:
>> 
>>> I definitely think branches are necessary. Just from my experience with jQuery, this has worked well.
>>> 
>>> When a new stable, minor version is released, a branch is created for it. So we would create a 1.0-stable branch or something like that. When bugs are fixed, they are fixed in master, then cherry-picked over to the current stable branch. When we are ready for a patch release (1.0.1 for example), that can be tagged directly from the 1.0-stable branch and all of those bug fixes already exist in master.
>> I agree, with the added difference that I don't think we should start creating branches until needed. If there's a bug to be fixed for 1.0.x series then we can go and create the branch.
>> 
>> (/me slightly remembers a project full of phantom branches without changes)
> So if I am a developer wanting to clone the source for a release, I will 
> always be able to checkout a tag.
Yes
> If there is a bug in a release I we will create a branch, fix the bug, 
> cut a new release, and tag in that branch?

No. If there is a bug that would just be part of a patch release, you would just make the fix in the stable branch, tag (or wait for more bug fixes for this patch release) and then release. No need for more branches until a minor or major release (1.0 -> 1.1 or 1.x -> 2.0).
> 
> 
>> -- qmx
>> 
>> 
>> _______________________________________________
>> aerogear-dev mailing list
>> aerogear-dev at lists.jboss.org
>> https://lists.jboss.org/mailman/listinfo/aerogear-dev
> 
> _______________________________________________
> aerogear-dev mailing list
> aerogear-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/aerogear-dev