Re: [Asterisk-java-devel] 1.1 release

[Enguerrand de R. <eng...@el...>]

Hi Brett

so the only disadvantage I see with branching 1.1 from 1.0 is that if you'd ever want to do a bugfix/maintenance release on the 1.0 version (e.g. 1.0.1) this would become a bit messy.
That said, given how long there was a RC for 1.0 this might be a pretty theoretical problem.

Either way, I guess there will be a need to address this sooner or later, but I am by no means a git expert either, so maybe there is an elegant solution to this.
However, I don't know that I will be able to take over the merging tasks you suggested. To tell the truth, I was really only looking to contribute my code and was hoping for guidance as to how I should do it to minimize the work needed to incorporate it.

As I said earlier I have a couple of small patches here which I believe should probably go into 1.1 and then I have a couple of Asterisk 13 relevant changes which I would hold back until you guys start working on one of the later releases.

As soon as the respective branches for these two contributions are ready for it I would add the changes to them in my fork and send you a pull request.
Let me know if that makes sense?

Cheers
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: Mittwoch, 29. April 2015 06:29
An: ast...@li...
Betreff: Re: [Asterisk-java-devel] 1.1 release

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



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.