dev@glassfish.java.net

Re: 3.1 branch is open for integrations

From: Tom Mueller <tom.mueller_at_oracle.com>
Date: Fri, 28 Jan 2011 10:57:03 -0600

I haven't heard any announcement that the trunk is open for 3.2-related
work yet.

Every change for 3.1 now has to be committed twice, once in the trunk
and once in the 3.1 branch. Some people choose to implement and commit
first in the branch and forward port to the trunk. Others choose to
implement and commit first in the trunk and backport to the branch.
Without a good process, some doing the former might implement only in
the branch and forget/neglect to forward port into the trunk, which
eventually will result in regressions in 3.2. That's why I recommend
doing the latter: implement and commit first on the trunk and backport.
I wish we could get sustaining to do that too, but that would probably
add too much to sustaining release development cycles.

Tom


On 1/28/2011 10:45 AM, Jason Lee wrote:
> I'm confused a bit, I think. Is the branch for 3.1 final and the
> trunk open for 3.2-related work?
>
> On 1/28/11 9:46 AM, Tom Mueller wrote:
>> Can we have the process be to always implement everything in the
>> trunk first, and then backport to the 3.1 branch if necessary?
>> Tom
>>
>> On 1/28/2011 3:59 AM, Sahoo wrote:
>>> On Friday 28 January 2011 06:31 AM, Chris Kasso wrote:
>>>> Please integrate all 3.1 changes into the new 3.1 branch*and*
>>>> the existing trunk.
>>>>
>>> Is there a process in place for ensuring that all check-ins to
>>> 3.1-branch are eventually forward ported to trunk?
>
>
> --
> Jason Lee
> Senior Member of Technical Staff
> GlassFish REST API / Administration Console
>
> Oracle Corporation
> Phone +1 405-216-3193
> Bloghttp://blogs.steeplesoft.com