I don't understand why we'd have multiple branches for a single release.<br><br>Surely any fixes needed for the release would be made in the single branch?<br><br>If we need to make another branch for a single release it suggests something fundamentally wrong with the original branch, so why not delete and re-create, leaving a single "5.2.0-M2.x" branch?<br>
<br>If our "internal" team is confused what hope does our community have?<br><br>Cheers,<br><br>Mike<br><br><div class="gmail_quote">On 23 December 2010 09:47, Jervis Liu <span dir="ltr"><<a href="mailto:jliu@redhat.com">jliu@redhat.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"><div class="im">On 2010/12/23 17:27, Geoffrey De Smet wrote:<br>
> Not that I am mad, but yea, git knows which parent revision it came from<br>
> and even which commits were cherry picked from master etc.<br>
> Sticking the revision in there isn't really useful, as it's not really<br>
> the revision that is going to be released:<br>
> there will be bugfix commits applied and possibly even big merges from<br>
> master.<br>
><br>
> What is bad, is the confusion this creates for anyone who isn't working<br>
> on the release.<br>
> What is the release branch for M1? Is it /5.2.0.M1.x/ or /5.2.0-M1.901ad86/?<br>
> /There can only be one./ And the rest of us need to be able to guess it.<br>
><br>
> So follow the naming convention we discussed earlier:<br>
><br>
> * all release branches should end in ".x"<br>
</div>> o To avoid confusing them with release tags or topic branches<br>
<div class="im">> * all release tags should be equal to the version the represent<br>
</div>> o and a tag should only be set just before it's uploaded to<br>
<div class="im">> the maven repo and then NEVER changed<br>
> + Yes, with never I mean even if the release is broken.<br>
> Then just do a hotfix .1 (for example 5.1.1 or<br>
> 5.2.0.M1.1) version<br>
> # because maven repo's are cached locally forever.<br>
><br>
</div>I do understand the idea here. Though I just thought the .x is a suffix<br>
we can use to distinguish different branches we'v created for the same<br>
release. For example, for this release we've already had two branches,<br>
the first one is 5.2.0-M1.x. To distingush the new branch from existing<br>
one, I name it as 5.2.0-M1.901ad86, which is essentially equal to<br>
5.2.0-M1.2.<br>
<br>
5.2.0-M1.2 can be interpreted as "attempt 2 for release 5.2.0-M1", while<br>
5.2.0-M1.901ad86 can be interpreted as "attempt for release 5.2.0-M1<br>
whose version is based on 901ad86", IMO more illustrative than ".2".<br>
<br>
Did I get this right or I am still missing sth?<br>
<br>
Thanks,<br>
Jervis<br>
<div class="im"><br>
<br>
<br>
> for example:<br>
><br>
> * release branch 5.1.x<br>
</div>> o with release tags 5.1.0.CR1, 5.1.0.FINAL, 5.1.1.FINAL<br>
<div class="im">> * release branch 5.2.0.M1.x<br>
</div>> o with release tags 5.2.0.M1<br>
<div class="im">> * release branch 5.2.0.M2.x<br>
</div>> o with release tags 5.2.0.M2<br>
<div class="im">> * release branch 5.2.x<br>
</div>> o with release tags 5.2.0.CR1, 5.2.0.FINAL, 5.2.1.FINAL<br>
<div class="im">><br>
> Depending on the JBoss version number conventions, the finals release<br>
> versions should end in FINAL or GA or nothing.<br>
> It looks like it's ".FINAL" these days, not sure.<br>
> WDYT?<br>
><br>
> Op 23-12-10 09:41, Michael Anstis schreef:<br>
>> Ge0ffrey won't be happy ;)<br>
>><br>
>> I'm sure he was keen to drop the revision\version number from the<br>
>> branch name; hence 5.2.0-M1 would probably have sufficed :)<br>
>><br>
>> Cheers,<br>
>><br>
>> Mike<br>
>><br>
>> On 23 December 2010 06:22, Jervis Liu <<a href="mailto:jliu@redhat.com">jliu@redhat.com</a><br>
</div><div class="im">>> <mailto:<a href="mailto:jliu@redhat.com">jliu@redhat.com</a>>> wrote:<br>
>><br>
>> Hi, I've created a new branch for Drools 5.2.0-M1 release:<br>
>> 5.2.0-M1.901ad86. This branch is created from version<br>
>> 901ad86c8fad67051646. Check<br>
>> <a href="https://github.com/droolsjbpm/droolsjbpm/commits/master?page=1" target="_blank">https://github.com/droolsjbpm/droolsjbpm/commits/master?page=1</a> for<br>
>> version details. Please let me know if you think this branch<br>
>> should not<br>
>> contain a certain commit or a certain commit for 5.2.0-M1 release is<br>
>> missed on this branch.<br>
>><br>
>> Cheers,<br>
>> Jervis<br>
>> _______________________________________________<br>
>> rules-dev mailing list<br>
</div>>> <a href="mailto:rules-dev@lists.jboss.org">rules-dev@lists.jboss.org</a> <mailto:<a href="mailto:rules-dev@lists.jboss.org">rules-dev@lists.jboss.org</a>><br>
<div><div></div><div class="h5">>> <a href="https://lists.jboss.org/mailman/listinfo/rules-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a><br>
>><br>
>><br>
>><br>
>> _______________________________________________<br>
>> rules-dev mailing list<br>
>> <a href="mailto:rules-dev@lists.jboss.org">rules-dev@lists.jboss.org</a><br>
>> <a href="https://lists.jboss.org/mailman/listinfo/rules-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a><br>
><br>
> --<br>
> With kind regards,<br>
> Geoffrey De Smet<br>
><br>
><br>
><br>
> _______________________________________________<br>
> rules-dev mailing list<br>
> <a href="mailto:rules-dev@lists.jboss.org">rules-dev@lists.jboss.org</a><br>
> <a href="https://lists.jboss.org/mailman/listinfo/rules-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a><br>
<br>
_______________________________________________<br>
rules-dev mailing list<br>
<a href="mailto:rules-dev@lists.jboss.org">rules-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/rules-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a><br>
</div></div></blockquote></div><br>