geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Matt Hogstrom <m...@hogstrom.org>
Subject Re: m2migration branch is available
Date Tue, 04 Jul 2006 15:37:24 GMT
Sent a note in a related thread asking to have RTC suspended for this activity and let the
work 
proceed in trunk directly.

Aaron Mulder wrote:
> Are you recommending that the project switch to Perforce, or is this
> just wishful thinking?
> 
> Also, one more note on the merging -- If we change the directory
> layout in the branch, it will be very hard to merge any patches to
> HEAD into the branch to keep them in sync since all the patch paths
> will be wrong.  I don't see how this can end well.  Unless there's a
> freeze in HEAD for the duration of the branch, which would mean we're
> just using the branch to work around RTC.
> 
> Thanks,
>    Aaron
> 
> On 7/4/06, Jason Dillon <jason@planet57.com> wrote:
>> FYI... Perforce may be commercial, but they provide free licenses for
>> qualifying open source usage:
>>
>>      http://perforce.com/perforce/opensource-faq.html
>>
>> :-)
>>
>> --jason
>>
>>
>> On Jul 4, 2006, at 3:50 AM, Aaron Mulder wrote:
>>
>> > Jacek,
>> >
>> > When discussing whether a branch was appropriate, I expressed a
>> > concern that it would be difficult to merge changes from this branch
>> > to HEAD because SVN seems to have difficulty handling multiple
>> > revisions of add/delete/move/copy operations in a single merge (and I
>> > understand the M2 restructuring will involve a lot of that).  I've
>> > often had problems where something is e.g. removed and then recreated
>> > and I try to apply and it refuses claiming that there's something in
>> > the way.  The only way to proceed is to manually delete offending
>> > directories and then update.  But that won't work for merging from a
>> > branch to HEAD -- it would effectively be a revolution operation where
>> > we would have to vote to delete HEAD and move the branch to HEAD.
>> > Then we lose the bug fixes that have been applied to HEAD and we've
>> > been through that before.
>> >
>> > I'm concerned that you ignored this concern and went ahead with the
>> > branch plan.  In fact the only response I got was that perhaps a
>> > commercial source control system would be better.  Perhaps that means
>> > this should have been an RTC operation so you were forced to address
>> > my concern before taking this approach.
>> >
>> > Thanks,
>> >    Aaron
>> >
>> > On 7/4/06, Jacek Laskowski <jacek@laskowski.net.pl> wrote:
>> >> Hi,
>> >>
>> >> Just created a branch - m2migration - for all our work pertaining to
>> >> the M2 migration of Geronimo build. Everybody's welcome to work on it
>> >> *without* RTC on. Revolutionary rules are enabled again! ;-)
>> >>
>> >> The branch is available at
>> >> https://svn.apache.org/repos/asf/geronimo/branches/m2migration.
>> >>
>> >> Once we're ready to move a part of the work done in this branch,
>> >> we'll
>> >> create a patch and RTC'ed it to commit to trunk. I believe it will
>> >> help those who are reluctant to work on the branch and give a hope
>> >> not
>> >> all is/will be lost ;-)
>> >>
>> >> Just to be clear: anybody who wants to learn M2 tricks and help us
>> >> with the migration is welcome. Those who aren't committers can/should
>> >> count on me to commit their work (my kids are away on their vacation,
>> >> so let's do it before they come back home ;-))
>> >>
>> >> Jacek
>> >>
>> >> --
>> >> Jacek Laskowski
>> >> http://www.laskowski.net.pl
>> >>
>>
>>
> 
> 
> 

Mime
View raw message