[aerogear-dev] Maintenance branches

[Kris Borchers]

I knew my stable branch idea wasn't totally crazy :)

+1 for policy to discuss

On Mar 26, 2013, at 11:58 AM, Douglas Campos <qmx at qmx.me> wrote:

> Well, in this case you are just reinforcing Kris' idea of having a stable branch - and now I can see the trouble :)
> 
> How about me writing a tag/branch policy like the versioning one, so y'all can comment on it?
> 
> On 26/03/2013, at 13:02, Daniel Bevenius <daniel.bevenius at gmail.com> wrote:
> 
>> I feel like I'm missing something here but think this is a little confusing. I'll try to explain...
>> 
>>> 1.0.0 -> 1.0.1-SNAPSHOT
>> So, our master branch would have version 1.0.1-SNAPSHOT after the release. Looking at the version 1.0.1-SNAPSHOT someone might think that this branch will only contain patches/bugfixes and not new features.  
>> As development will start pretty much at once after a release, chances are that we will be adding new features before getting bug reports. For that reason I thought that we would directly dump the minor version to 1.1.0-SNAPSHOT, and bugfixes would be done on master as mentioned earlier. At some point we would create a branch for 1.0.1 and cherry-pick the bugfixes to be included, and we would make that branches version be 1.0.1-SNAPSHOT. More fixes could be included in that branch as needed, and when we have enough fixes, or very critical ones, we would release 1.0.1. 
>> 
>> 
>> 
>> 
>> 
>> 
>> 
>> On 26 March 2013 16:34, Kris Borchers <kris at redhat.com> wrote:
>> OK. I guess having in progress versions not match is ok.
>> 
>> On Mar 26, 2013, at 10:33 AM, Douglas Campos <qmx at qmx.me> wrote:
>> 
>>> exactly, you won't use SNAPSHOT, maven forces you to do so, and has a dedicated repo for intermediate "on the go" release"
>>> 
>>> On 26/03/2013, at 12:31, Kris Borchers <kris at redhat.com> wrote:
>>> 
>>>> I think it does apply. I need a version to put in my package.json on master to indicate it's the next version in progress.
>>>> 
>>>> On Mar 26, 2013, at 10:30 AM, Douglas Campos <qmx at qmx.me> wrote:
>>>> 
>>>>> 
>>>>> On 26/03/2013, at 12:21, Kris Borchers <kris at redhat.com> wrote:
>>>>> 
>>>>>> -SNAPSHOT makes my skin crawl. Can we use the more semver way of -pre?
>>>>> 
>>>>> er, this is maven, ignore it - doesn't apply to JS, nor iOS
>>>>> 
>>>>> --
>>>>> 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
>>> 
>>> --
>>> 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
>> 
>> _______________________________________________
>> aerogear-dev mailing list
>> aerogear-dev at lists.jboss.org
>> https://lists.jboss.org/mailman/listinfo/aerogear-dev
> 
> -- 
> qmx
> 
> 
> _______________________________________________
> aerogear-dev mailing list
> aerogear-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/aerogear-dev