<div dir="ltr"><br><div style> You probably know that, but worth mentioning, now that the code base is very similar in both branches, we can do bulk cherry-picks... git cherry-pick -x initialCommit..finalCommit ... this gets harder to do when the code base differs or not all commits should be cherry-picked (i.e., after we final community).</div>
<div style><br></div><div style> Edson</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jul 26, 2013 at 3:21 AM, Salaboy <span dir="ltr"><<a href="mailto:salaboy@gmail.com" target="_blank">salaboy@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="auto"><div>Yeah I will wait for mikes cherry picks <br><br>Sent from my iPhone</div><div><div class="h5"><div>
<br>On 26 Jul 2013, at 08:03, Michael Anstis <<a href="mailto:michael.anstis@gmail.com" target="_blank">michael.anstis@gmail.com</a>> wrote:<br><br></div><blockquote type="cite"><div><p dir="ltr">I've got a ton of cherry picks to do for guvnor, kie-wb-common and drools-wb plus a couple for droolsjbpm-build-bootstrap and kie-wb-distributions.</p>
<p dir="ltr">I'm on PTO until Monday, so it might be worth holding off on cherry picking to the first three until I've cherry picked first to minimize conflicts.</p>
<p dir="ltr">Sent on the move</p>
<div class="gmail_quote">On 25 Jul 2013 22:01, "Edson Tirelli" <<a href="mailto:ed.tirelli@gmail.com" target="_blank">ed.tirelli@gmail.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr"><div><br></div> All,<div><br></div><div> As you probably know, 6.0.0.CR1 was tagged yesterday and the corresponding branch (6.0.x) was created last Tuesday.</div><div><br></div><div> As a reminder, since the creation of the branch and until we release 6.0.0.Final:</div>
<div><br></div><div>(1) please cherry-pick all commits you make for master into the 6.0.x branch. Do not wait to cherry-pick, because this might end up creating conflicts if commits are cherry-picked out of order. Also don't forget to cherry-pick.</div>
<div><br></div><div>(2) if there is a BZ and/or JIRA for your work (there should be), add the BZ/JIRA numbers to your commit message</div><div><br></div><div>(3) add the link to your commit as a comment on the corresponding BZ</div>
<div><br></div><div> Item (3) above is temporary until they fix the BZ/GitHub integration, but important.</div><div><br></div><div> After we release 6.0.0.Final, you should only cherry-pick commits into 6.0.x branch if they have a corresponding BZ and the 3 acks set.</div>
<div><br></div><div> Let us know if you have any questions.</div><div><br></div><div> Thanks,</div><div> Edson<br clear="all"><div><br></div>-- <br><div dir="ltr"> Edson Tirelli<br> Principal Software Engineer <div>
Red Hat Business Systems and Intelligence Group<br><br></div></div>
</div></div>
<br>_______________________________________________<br>
rules-dev mailing list<br>
<a href="mailto:rules-dev@lists.jboss.org" target="_blank">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></blockquote></div>
</div></blockquote></div></div><blockquote type="cite"><div><span>_______________________________________________</span><br><span>jbpm-dev mailing list</span><br><span><a href="mailto:jbpm-dev@lists.jboss.org" target="_blank">jbpm-dev@lists.jboss.org</a></span><br>
<span><a href="https://lists.jboss.org/mailman/listinfo/jbpm-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/jbpm-dev</a></span></div></blockquote></div><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></blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr"> Edson Tirelli<br>
Principal Software Engineer <div> Red Hat Business Systems and Intelligence Group<br><br></div></div>
</div>