You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by Stefan Bodewig <bo...@apache.org> on 2012/03/16 05:58:26 UTC
Merging to the 1.8.x branch
Hi,
WRT merging to the branch we basically have two options: (1) merge when
we commit to trunk or (2) merge when we know we want to create another
1.8.x release.
I'm leaning towards (2) since I personally don't expect a 1.8.4
release. But just in case I've created a wiki page at
<http://wiki.apache.org/ant/MergeCandidates18xBranch> listing the
changesets that could be merged easily and would be important enough to
go into the next release. I haven't found the time to review Jesse's
commits of the past two weeks, yet.
Is this a dumb idea? Should we merge stuff right away?
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: Merging to the 1.8.x branch
Posted by Jesse Glick <je...@oracle.com>.
On 03/16/2012 04:48 PM, Bruce Atherton wrote:
> If there are bug fixes that need to go into a future 1.8.4 release we can deal with them when the time comes.
Agreed, i.e. option 2. Rather than sifting through all commits made into trunk - which besides Java 5 could include all sorts of code cleanups or other minor stuff -
looking to see what might be applicable to 1.8.x, I think it would make more sense to keep the 1.8.x branch relatively frozen. If and when we decide to do a 1.8.4
release, we can look through Bugzilla for fixed bugs with TM >= 1.9.0, decide which ones are good backport candidates (important bug, safe and well-tested fix), and merge
or otherwise backport just the necessary bug fix commits.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: Merging to the 1.8.x branch
Posted by Bruce Atherton <br...@callenish.com>.
I agree. Option 2 is the better choice.
Changesets on trunk can be Java5 specific. It would be problematic to
have to also include tested Java 1.4 versions on a 1.8 branch that may
never see the light of day. If there are bug fixes that need to go into
a future 1.8.4 release we can deal with them when the time comes. And
anyone who wants to do the extra work up front can do as you did,
updating that wiki page with the changeset that should be included (or
possibly including a 1.8.x patch in bugzilla if it is very different
from the change in trunk).
On 3/16/2012 8:09 AM, Matt Benson wrote:
> On Thu, Mar 15, 2012 at 11:58 PM, Stefan Bodewig<bo...@apache.org> wrote:
>> Hi,
>>
>> WRT merging to the branch we basically have two options: (1) merge when
>> we commit to trunk or (2) merge when we know we want to create another
>> 1.8.x release.
>>
>> I'm leaning towards (2) since I personally don't expect a 1.8.4
>> release. But just in case I've created a wiki page at
>> <http://wiki.apache.org/ant/MergeCandidates18xBranch> listing the
>> changesets that could be merged easily and would be important enough to
>> go into the next release. I haven't found the time to review Jesse's
>> commits of the past two weeks, yet.
>>
>> Is this a dumb idea? Should we merge stuff right away?
> Option 2 sounds fine to me.
>
> Matt
>
>> Stefan
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
>> For additional commands, e-mail: dev-help@ant.apache.org
>>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: Merging to the 1.8.x branch
Posted by Matt Benson <gu...@gmail.com>.
On Thu, Mar 15, 2012 at 11:58 PM, Stefan Bodewig <bo...@apache.org> wrote:
> Hi,
>
> WRT merging to the branch we basically have two options: (1) merge when
> we commit to trunk or (2) merge when we know we want to create another
> 1.8.x release.
>
> I'm leaning towards (2) since I personally don't expect a 1.8.4
> release. But just in case I've created a wiki page at
> <http://wiki.apache.org/ant/MergeCandidates18xBranch> listing the
> changesets that could be merged easily and would be important enough to
> go into the next release. I haven't found the time to review Jesse's
> commits of the past two weeks, yet.
>
> Is this a dumb idea? Should we merge stuff right away?
Option 2 sounds fine to me.
Matt
>
> Stefan
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org