geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jason Dillon <>
Subject Re: m2migration branch is available
Date Tue, 04 Jul 2006 11:11:10 GMT
FYI... Perforce may be commercial, but they provide free licenses for  
qualifying open source usage:



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 <> 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
>> 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

View raw message