Re: [Asterisk-java-devel] 1.1 release

[Brett S. <bs...@no...>]

Enguerrand,
so frankly I'm not certain of the best way to move forward.

Here are the issues as I see them (from a non git expert)

Reading up on branching strategies seems to imply that you normally 
branch from develop.

My concern with branching from develop, for 1.1, was that I'm not 
certain just how much code has been pushed into develop and of what 
quality it is. It may also have a fair amount of asterisk 11/13 code 
which 1.1 is not really about.

Going back to the wiki release notes, 1.1 is intended to only collect up 
small enhancments against 1.4, 1.6, and 1.8.

Having said that, the 11/13 code in develop is probably not harmful.

I note there there are also a number of outstanding pull requests that 
we need to resolve.
Would you be happy to have a look at merging those back into develop?

There are also a small no. of changes in 1.0 which won't be in develop.
Are you able to merge these into 1.1?

So the end result is that I'm prepared to be guided on this one.

If you think we can branch from develop and still get a stable release 
without massive amounts of effort then go ahead and branch from develop.

I've previously suggested that we should follow this model.

http://nvie.com/posts/a-successful-git-branching-model/

Brett




On 29/04/15 00:48, Enguerrand de Rochefort wrote:
> Can we talk about the branching strategy a bit more, I am not sure I am clear about the direction here.
> I just forked the repo on Github and would start incorporating changes I'd like to see in 1.1.
>
> I'd expect to branch each release branch off of develop and would hence be committing my changes to develop. However, Brett's mail below says we'll branch off 1.1. from 1.0, so now I am a bit confused.
>
> Can someone enlighten me as to which branch I should be working on to prepare something to be shared back via a pull request.
>
> Thanks
> Enguerrand
>
>
> ------------------------------------------------------------------------------------
> Dipl.-Ing. Enguerrand de Rochefort
> Softwareentwickler
> mailto:eng...@el...
> Tel:  +49-241-566266-72
> Fax: +49-241-566266-29
>
> -----Ursprüngliche Nachricht-----
> Von: Brett Sutton [mailto:bs...@no...]
> Gesendet: Freitag, 17. April 2015 02:48
> An: ast...@li...
> Betreff: [Asterisk-java-devel] 1.1 release
>
> So given we have a decision on the 1.0 release lets nail down the details of 1.1.
>
> Give the low response I'm inclined to do the following.
>
> Create a 1.1 branch (need some help here should this be from the 1.0 branch or from master)
>
> The 1.1 branch will support the following
>
> 1.4
>
> 1.6
>
> 1.8
>
> 10
>
> Subject to the assumption that we don't have to add any new major features to support these versions.
> 1.1. should be considered a bug fix release with perhaps a few wholes filled with minor features.
>
> An example of an acceptable feature might be support for a new action or event.
> An example of an un-acceptable feature would be anything that requires significant restructuring of the code.
>
> 1.1. should be a nice gentle release which aims to break nothing.
>
>
> Do we have someone(s) prepared to start the process of marshalling appropriate bug fixes and features into 1.1?
>
> Objections?
> Suggestions?
>
> Brett
>
>
>
> ------------------------------------------------------------------------------
> BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT Develop your own process in accordance with the BPMN 2 standard Learn Process modeling best practices with Bonita BPM through live exercises
> http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_ source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
> _______________________________________________
> Asterisk-java-devel mailing list
> Ast...@li...
> https://lists.sourceforge.net/lists/listinfo/asterisk-java-devel
> ELARA Leitstellentechnik GmbH Member of Frequentis Group Schloss-Rahe-Str. 19a 52072 Aachen Geschäftsführender Gesellschafter: Dr.-Ing. Frank Herzog Geschäftsführer: Dipl.-Ing. Hans Werner Güntzel Amtsgericht Aachen HRB 17856 St.-Nr.: 201/5956/4218 USt-IdNr.: DE 285 827 521 --------------------------------------------------------------------------------------------- Diese Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtuemlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das unerlaubte Kopieren sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet. This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e- mail is strictly forbidden.
>
> ------------------------------------------------------------------------------
> One dashboard for servers and applications across Physical-Virtual-Cloud
> Widest out-of-the-box monitoring support with 50+ applications
> Performance metrics, stats and reports that give you Actionable Insights
> Deep dive visibility with transaction tracing using APM Insight.
> http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
> _______________________________________________
> Asterisk-java-devel mailing list
> Ast...@li...
> https://lists.sourceforge.net/lists/listinfo/asterisk-java-devel


-- 
S. Brett Sutton

Ph: 1300 NOOJEE (1300 666 533)
Noojee Telephony Solutions - On Demand Contact Centres Solutions
www.noojee.com.au