<div dir="ltr">><span style="font-family:arial,sans-serif;font-size:13px">I don't think a branch is necessary. If we have something to fix, we create a temporary branch, fix, merge to master and create a tag for it</span><div style>
<font face="arial, sans-serif">I'm not sure I see how using only tags can solve this following issue (please correct me if I'm wrong):</font></div><div style><font face="arial, sans-serif">Lets say we have a bug fix for 1.0.0. This would go out with the release of 1.0.1. But before 1.0.1 is released other features could have been added to the master branch. So we would then be releasing more than just the bug fixes for 1.0.1, we would also be releasing any new features added to master. This is the reason for wanting a branch.</font></div>
<div style><font face="arial, sans-serif"><br></font></div><div style><font face="arial, sans-serif"><br></font></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On 22 March 2013 13:22, Daniel Passos <span dir="ltr"><<a href="mailto:daniel@passos.me" target="_blank">daniel@passos.me</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">IMO tags work fine.<div><br></div><div>
<div>I don't think a branch is necessary. If we have something to fix, we create a temporary branch, fix, merge to master and create a tag for it</div><span class="HOEnZb"><font color="#888888"><div><br></div><div>Daniel Passos</div>
</font></span><div><div class="h5"><br><div class="gmail_quote">
On Fri, Mar 22, 2013 at 7:03 AM, Bruno Oliveira <span dir="ltr"><<a href="mailto:bruno@abstractj.org" target="_blank">bruno@abstractj.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi Dan, I believe that we will stick with the following approach <a href="http://aerogear-dev.1069024.n5.nabble.com/aerogear-dev-RFC-Initial-Versioning-Policy-td1914.html" target="_blank">http://aerogear-dev.1069024.n5.nabble.com/aerogear-dev-RFC-Initial-Versioning-Policy-td1914.html</a><br>
<div><br>
<br>
<br>
--<br>
"The measure of a man is what he does with power" - Plato<br>
-<br>
@abstractj<br>
-<br>
Volenti Nihil Difficile<br>
<br>
<br>
<br>
</div><div>On Friday, March 22, 2013 at 6:57 AM, Daniel Bevenius wrote:<br>
<br>
> > I'm not sure if we really need branches, maybe just tags?<br>
><br>
> Not sure how that would work but I'd be interested to learn. I could not determine just by looking at the torguebox repo as then have branches for what looks like maintenance/dev releases (and also tags of course)<br>
> As long as we all do the same I'm happy.<br>
><br>
><br>
><br>
</div><div>> On 22 March 2013 10:23, Bruno Oliveira <<a href="mailto:bruno@abstractj.org" target="_blank">bruno@abstractj.org</a> (mailto:<a href="mailto:bruno@abstractj.org" target="_blank">bruno@abstractj.org</a>)> wrote:<br>
> > I'm not sure if we really need branches, maybe just tags? <a href="https://github.com/torquebox/torquebox" target="_blank">https://github.com/torquebox/torquebox</a> for example has been working with tags, branches at least to me might lead to confusion.<br>
> ><br>
> ><br>
> > --<br>
> > "The measure of a man is what he does with power" - Plato<br>
> > -<br>
> > @abstractj<br>
> > -<br>
> > Volenti Nihil Difficile<br>
> ><br>
> ><br>
> ><br>
> > On Friday, March 22, 2013 at 6:18 AM, Sebastien Blanc wrote:<br>
> ><br>
> > > +1 to create a 1.0.0 branch<br>
> > > For 1.0.1 not sure if it has to be also branch or just the master otherwise Master should be for 1.1 stuff ?<br>
> > > Seb<br>
> > ><br>
> > ><br>
> > ><br>
</div><div>> > > On Fri, Mar 22, 2013 at 10:12 AM, Daniel Bevenius <<a href="mailto:daniel.bevenius@gmail.com" target="_blank">daniel.bevenius@gmail.com</a> (mailto:<a href="mailto:daniel.bevenius@gmail.com" target="_blank">daniel.bevenius@gmail.com</a>) (mailto:<a href="mailto:daniel.bevenius@gmail.com" target="_blank">daniel.bevenius@gmail.com</a>)> wrote:<br>
> > > > Hi all,<br>
> > > ><br>
> > > > I'd like to discuss how to handle maintenance branches. Sorry if this has already been discussed, I think Kris posted something about this but I was not able to find it.<br>
> > > ><br>
> > > > For example, now that we are about to release 1.0.0 we will tag that release. After that should we create a 1.0.1 branch for patches/bugfixes and then continue with new features in master?<br>
> > > ><br>
> > > > Since we are in a waiting state at the moment, which could happen again, should we perhaps create a branch named 1.0.0, which we can use until the release and then tag it and remove that branch. After that any issues would be fixed in the 1.0.1 branch.<br>
> > > ><br>
> > > > Does this sound correct?<br>
> > > ><br>
> > > > Thanks,<br>
> > > ><br>
> > > > /Dan<br>
> > > ><br>
> > > ><br>
> > > > _______________________________________________<br>
> > > > aerogear-dev mailing list<br>
</div>> > > > <a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a> (mailto:<a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a>) (mailto:<a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a>)<br>
<div>> > > > <a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
> > ><br>
> > ><br>
> > ><br>
> > > _______________________________________________<br>
> > > aerogear-dev mailing list<br>
</div>> > > <a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a> (mailto:<a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a>) (mailto:<a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a>)<br>
<div><div>> > > <a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
> ><br>
> ><br>
> ><br>
> ><br>
> > _______________________________________________<br>
> > aerogear-dev mailing list<br>
> > <a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a> (mailto:<a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a>)<br>
> > <a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
><br>
><br>
> _______________________________________________<br>
> aerogear-dev mailing list<br>
> <a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a> (mailto:<a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a>)<br>
> <a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
<br>
<br>
<br>
_______________________________________________<br>
aerogear-dev mailing list<br>
<a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
</div></div></blockquote></div><br></div></div></div>
<br>_______________________________________________<br>
aerogear-dev mailing list<br>
<a href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br></blockquote></div><br></div>