You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geronimo.apache.org by Matt Hogstrom <ma...@hogstrom.org> on 2006/05/06 23:30:51 UTC
Thinking about 1.2 and moving forward
I think we're at the point where 1.1 needs to bake for a bit and we'll release it in a few weeks.
Since I expect that folks will want to get to putting in new feature and functions for 1.2 I wanted
to kick off a thread to get that discussion going.
I'm consolidating here my recollections of discussion on the list about what to do. The idea that
made the most sense to me was to move the current trunk to another branch and copy the 1.1 branch to
trunk. We'd then have people merge their changes from the the old trunk to the new and start on 1.2.
I'm not sure about timing but it might be nice to have this work done before Java One and the
hackathons.
Thoughts?
Matt
Re: Thinking about 1.2 and moving forward
Posted by Prasad Kashyap <go...@gmail.com>.
Hmm.. seems inevitable I guess. As for the M2 work done so far, I
understand we'd have to *move* it from the old trunk to the new trunk
(not exactly doing it all over again). Since it's the 2nd time
around, I hope we can run through it this time within a week.
Cheers
Prasad
On 5/7/06, Jeff Genender <jg...@apache.org> wrote:
> +1. I think trying to merge 1.1 to the current 1.2 trunk would be a
> nightmare, indeed. Moving aside 1.2 and making the 1.1 copy a new trunk
> is the best decision, IMHO.
>
> Matt Hogstrom wrote:
> > I think we're at the point where 1.1 needs to bake for a bit and we'll
> > release it in a few weeks. Since I expect that folks will want to get to
> > putting in new feature and functions for 1.2 I wanted to kick off a
> > thread to get that discussion going.
> >
> > I'm consolidating here my recollections of discussion on the list about
> > what to do. The idea that made the most sense to me was to move the
> > current trunk to another branch and copy the 1.1 branch to trunk. We'd
> > then have people merge their changes from the the old trunk to the new
> > and start on 1.2.
> >
> > I'm not sure about timing but it might be nice to have this work done
> > before Java One and the hackathons.
> >
> > Thoughts?
> >
> > Matt
>
Re: Thinking about 1.2 and moving forward
Posted by Jason Dillon <ja...@planet57.com>.
Not all of the changes are incompatible. If it was easier to
incrementally merge, then the overall problem would have been much
less.
For example, if we periodically merged trunk into 1.1, always keeping
1.1 up to date wrt changes on trunk, then the merge back would have
been mostly painless and quite easy to perform.
--jason
On 5/8/06, David Jencks <da...@yahoo.com> wrote:
>
> On May 8, 2006, at 12:03 PM, Jason Dillon wrote:
>
> > I agree this maybe the best option given the circumstances, but in
> > the future we should avoid this mess by reducing branch usage for
> > only isolated unstable feature work.... Or get an SCM that can
> > handle merging.
> >
> > It should be possible to have seperate development branches and
> > then be able to safly merge them. IMO it is a massive problem with
> > Subversion that it can not handle this... :-(
>
> What merge support is missing from svn? I don't know of any
> automated tool that can take 2 disparate lines of development with
> incompatible semantics and merge them.
>
> The problem would have been smaller if we had abandoned 1.1 and built
> the configid branch off of trunk, but we would still have to actually
> look at all the changes between the branches.
>
> thanks
> david jencks
>
> >
> > --jason
> >
> >
> > -----Original Message-----
> > From: Jeff Genender <jg...@apache.org>
> > Date: Sun, 07 May 2006 09:04:13
> > To:dev@geronimo.apache.org
> > Subject: Re: Thinking about 1.2 and moving forward
> >
> > +1. I think trying to merge 1.1 to the current 1.2 trunk would be a
> > nightmare, indeed. Moving aside 1.2 and making the 1.1 copy a new
> > trunk
> > is the best decision, IMHO.
> >
> > Matt Hogstrom wrote:
> >> I think we're at the point where 1.1 needs to bake for a bit and
> >> we'll
> >> release it in a few weeks. Since I expect that folks will want to
> >> get to
> >> putting in new feature and functions for 1.2 I wanted to kick off a
> >> thread to get that discussion going.
> >>
> >> I'm consolidating here my recollections of discussion on the list
> >> about
> >> what to do. The idea that made the most sense to me was to move the
> >> current trunk to another branch and copy the 1.1 branch to trunk.
> >> We'd
> >> then have people merge their changes from the the old trunk to the
> >> new
> >> and start on 1.2.
> >>
> >> I'm not sure about timing but it might be nice to have this work done
> >> before Java One and the hackathons.
> >>
> >> Thoughts?
> >>
> >> Matt
>
>
Re: Thinking about 1.2 and moving forward
Posted by David Jencks <da...@yahoo.com>.
On May 8, 2006, at 12:03 PM, Jason Dillon wrote:
> I agree this maybe the best option given the circumstances, but in
> the future we should avoid this mess by reducing branch usage for
> only isolated unstable feature work.... Or get an SCM that can
> handle merging.
>
> It should be possible to have seperate development branches and
> then be able to safly merge them. IMO it is a massive problem with
> Subversion that it can not handle this... :-(
What merge support is missing from svn? I don't know of any
automated tool that can take 2 disparate lines of development with
incompatible semantics and merge them.
The problem would have been smaller if we had abandoned 1.1 and built
the configid branch off of trunk, but we would still have to actually
look at all the changes between the branches.
thanks
david jencks
>
> --jason
>
>
> -----Original Message-----
> From: Jeff Genender <jg...@apache.org>
> Date: Sun, 07 May 2006 09:04:13
> To:dev@geronimo.apache.org
> Subject: Re: Thinking about 1.2 and moving forward
>
> +1. I think trying to merge 1.1 to the current 1.2 trunk would be a
> nightmare, indeed. Moving aside 1.2 and making the 1.1 copy a new
> trunk
> is the best decision, IMHO.
>
> Matt Hogstrom wrote:
>> I think we're at the point where 1.1 needs to bake for a bit and
>> we'll
>> release it in a few weeks. Since I expect that folks will want to
>> get to
>> putting in new feature and functions for 1.2 I wanted to kick off a
>> thread to get that discussion going.
>>
>> I'm consolidating here my recollections of discussion on the list
>> about
>> what to do. The idea that made the most sense to me was to move the
>> current trunk to another branch and copy the 1.1 branch to trunk.
>> We'd
>> then have people merge their changes from the the old trunk to the
>> new
>> and start on 1.2.
>>
>> I'm not sure about timing but it might be nice to have this work done
>> before Java One and the hackathons.
>>
>> Thoughts?
>>
>> Matt
Re: Thinking about 1.2 and moving forward
Posted by Jason Dillon <ja...@planet57.com>.
I agree this maybe the best option given the circumstances, but in the future we should avoid this mess by reducing branch usage for only isolated unstable feature work.... Or get an SCM that can handle merging.
It should be possible to have seperate development branches and then be able to safly merge them. IMO it is a massive problem with Subversion that it can not handle this... :-(
--jason
-----Original Message-----
From: Jeff Genender <jg...@apache.org>
Date: Sun, 07 May 2006 09:04:13
To:dev@geronimo.apache.org
Subject: Re: Thinking about 1.2 and moving forward
+1. I think trying to merge 1.1 to the current 1.2 trunk would be a
nightmare, indeed. Moving aside 1.2 and making the 1.1 copy a new trunk
is the best decision, IMHO.
Matt Hogstrom wrote:
> I think we're at the point where 1.1 needs to bake for a bit and we'll
> release it in a few weeks. Since I expect that folks will want to get to
> putting in new feature and functions for 1.2 I wanted to kick off a
> thread to get that discussion going.
>
> I'm consolidating here my recollections of discussion on the list about
> what to do. The idea that made the most sense to me was to move the
> current trunk to another branch and copy the 1.1 branch to trunk. We'd
> then have people merge their changes from the the old trunk to the new
> and start on 1.2.
>
> I'm not sure about timing but it might be nice to have this work done
> before Java One and the hackathons.
>
> Thoughts?
>
> Matt
Re: Thinking about 1.2 and moving forward
Posted by Jeff Genender <jg...@apache.org>.
+1. I think trying to merge 1.1 to the current 1.2 trunk would be a
nightmare, indeed. Moving aside 1.2 and making the 1.1 copy a new trunk
is the best decision, IMHO.
Matt Hogstrom wrote:
> I think we're at the point where 1.1 needs to bake for a bit and we'll
> release it in a few weeks. Since I expect that folks will want to get to
> putting in new feature and functions for 1.2 I wanted to kick off a
> thread to get that discussion going.
>
> I'm consolidating here my recollections of discussion on the list about
> what to do. The idea that made the most sense to me was to move the
> current trunk to another branch and copy the 1.1 branch to trunk. We'd
> then have people merge their changes from the the old trunk to the new
> and start on 1.2.
>
> I'm not sure about timing but it might be nice to have this work done
> before Java One and the hackathons.
>
> Thoughts?
>
> Matt
Re: Thinking about 1.2 and moving forward
Posted by Kevan Miller <ke...@gmail.com>.
On May 8, 2006, at 12:42 PM, Dain Sundstrom wrote:
> +1 to the re-cut trunk plan
>
> I do not want to re-cut trunk, until we have the time to setup
> gbuild to tck test it, and capacity on gbuild to run it. We should
> never be out of compliance again. It is just to painful to fix later.
+ a bunch... Not only is it painful, but it's also risky -- you don't
know what issues are going to be found late in the game... It will be
hard to do this 100% of the time, but we need to find a way to do
this in reasonable size chunks...
--kevan
>
> -dain
>
> On May 6, 2006, at 2:30 PM, Matt Hogstrom wrote:
>
>> I think we're at the point where 1.1 needs to bake for a bit and
>> we'll release it in a few weeks. Since I expect that folks will
>> want to get to putting in new feature and functions for 1.2 I
>> wanted to kick off a thread to get that discussion going.
>>
>> I'm consolidating here my recollections of discussion on the list
>> about what to do. The idea that made the most sense to me was to
>> move the current trunk to another branch and copy the 1.1 branch
>> to trunk. We'd then have people merge their changes from the the
>> old trunk to the new and start on 1.2.
>>
>> I'm not sure about timing but it might be nice to have this work
>> done before Java One and the hackathons.
>>
>> Thoughts?
>>
>> Matt
>
Re: Thinking about 1.2 and moving forward
Posted by Dain Sundstrom <da...@iq80.com>.
+1 to the re-cut trunk plan
I do not want to re-cut trunk, until we have the time to setup gbuild
to tck test it, and capacity on gbuild to run it. We should never be
out of compliance again. It is just to painful to fix later.
-dain
On May 6, 2006, at 2:30 PM, Matt Hogstrom wrote:
> I think we're at the point where 1.1 needs to bake for a bit and
> we'll release it in a few weeks. Since I expect that folks will
> want to get to putting in new feature and functions for 1.2 I
> wanted to kick off a thread to get that discussion going.
>
> I'm consolidating here my recollections of discussion on the list
> about what to do. The idea that made the most sense to me was to
> move the current trunk to another branch and copy the 1.1 branch to
> trunk. We'd then have people merge their changes from the the old
> trunk to the new and start on 1.2.
>
> I'm not sure about timing but it might be nice to have this work
> done before Java One and the hackathons.
>
> Thoughts?
>
> Matt
Re: Thinking about 1.2 and moving forward
Posted by anita kulshreshtha <a_...@yahoo.com>.
--- Jacek Laskowski <ja...@laskowski.net.pl> wrote:
> On 5/6/06, Matt Hogstrom <ma...@hogstrom.org> wrote:
>
> > I'm consolidating here my recollections of discussion on the list
> about what to do. The idea that
> > made the most sense to me was to move the current trunk to another
> branch and copy the 1.1 branch to
> > trunk. We'd then have people merge their changes from the the old
> trunk to the new and start on 1.2.
>
> Hi Matt,
>
> Nice you've asked about it ;) I'm almost certain to be the only one
> who didn't fancy doing as you described, but it seems there's no
> other
> way to work it out.
true..
Although there's much done wrt M2 conversion, I
> think we can do it *again* hopefully without much pain along the
> way...unless Prasad and Anita object.
Since m2 build runs parallel to m1, I am also hopeful it will go
smoothly.
Thanks
Anita
>
> I think the 1.1 branch has existed too long and it's time to wipe it
> out and never ever done such a lengthy break-off again.
>
> > Matt
>
> Jacek
>
> --
> Jacek Laskowski
> http://www.laskowski.net.pl
>
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
Re: Thinking about 1.2 and moving forward
Posted by Jacek Laskowski <ja...@laskowski.net.pl>.
On 5/6/06, Matt Hogstrom <ma...@hogstrom.org> wrote:
> I'm consolidating here my recollections of discussion on the list about what to do. The idea that
> made the most sense to me was to move the current trunk to another branch and copy the 1.1 branch to
> trunk. We'd then have people merge their changes from the the old trunk to the new and start on 1.2.
Hi Matt,
Nice you've asked about it ;) I'm almost certain to be the only one
who didn't fancy doing as you described, but it seems there's no other
way to work it out. Although there's much done wrt M2 conversion, I
think we can do it *again* hopefully without much pain along the
way...unless Prasad and Anita object.
I think the 1.1 branch has existed too long and it's time to wipe it
out and never ever done such a lengthy break-off again.
> Matt
Jacek
--
Jacek Laskowski
http://www.laskowski.net.pl
Re: Thinking about 1.2 and moving forward
Posted by David Jencks <da...@yahoo.com>.
I'm afraid it will take several weeks to merge the 1.2 changes into
1.1 and result in something that vaguely works. I also think we have
more than enough to do to get 1.1 out the door.
Hopefully I'm wrong on both these counts.
thanks
david jencks
On May 7, 2006, at 3:19 PM, Matt Hogstrom wrote:
> I was thinking about Java One as there will be ample time for folks
> to get together and it seemed like a good idea to have a branch for
> them to work in. Aaron's note in a separate thread is a good
> reminder that 1.1 has lots of work that needs to be completed as
> well. Hopefully well be able to balance innovation and the hard
> work to get the release out.
>
> Matt
>
> Matt Hogstrom wrote:
>> I think we're at the point where 1.1 needs to bake for a bit and
>> we'll release it in a few weeks. Since I expect that folks will
>> want to get to putting in new feature and functions for 1.2 I
>> wanted to kick off a thread to get that discussion going.
>> I'm consolidating here my recollections of discussion on the list
>> about what to do. The idea that made the most sense to me was to
>> move the current trunk to another branch and copy the 1.1 branch
>> to trunk. We'd then have people merge their changes from the the
>> old trunk to the new and start on 1.2.
>> I'm not sure about timing but it might be nice to have this work
>> done before Java One and the hackathons.
>> Thoughts?
>> Matt
Re: Thinking about 1.2 and moving forward
Posted by Matt Hogstrom <ma...@hogstrom.org>.
I was thinking about Java One as there will be ample time for folks to get together and it seemed
like a good idea to have a branch for them to work in. Aaron's note in a separate thread is a good
reminder that 1.1 has lots of work that needs to be completed as well. Hopefully well be able to
balance innovation and the hard work to get the release out.
Matt
Matt Hogstrom wrote:
> I think we're at the point where 1.1 needs to bake for a bit and we'll
> release it in a few weeks. Since I expect that folks will want to get to
> putting in new feature and functions for 1.2 I wanted to kick off a
> thread to get that discussion going.
>
> I'm consolidating here my recollections of discussion on the list about
> what to do. The idea that made the most sense to me was to move the
> current trunk to another branch and copy the 1.1 branch to trunk. We'd
> then have people merge their changes from the the old trunk to the new
> and start on 1.2.
>
> I'm not sure about timing but it might be nice to have this work done
> before Java One and the hackathons.
>
> Thoughts?
>
> Matt
>
>
>