[etoys-dev] Re: Merging Etoys

[karl ramberg]

On Fri, Feb 19, 2010 at 1:37 PM, K. K. Subramaniam <subbukk at gmail.com> wrote:
> On Friday 19 February 2010 12:36:25 pm Bert Freudenberg wrote:
>> 3.8 was the last common release. That's why Etoys doesn't even have MC. I
>> think the very first step would be to repackage Etoys, just like Andreas
>> did with 3.8. Since 3.9 the main line uses MC.
> Repackage which Etoys? Etoys from Etoys trunk or the Etoys in Squeak trunk?
>
> I have 422 patches from 1900htmlColor-bf.cs till 2340*.cs (so far) that I can
> try to manually merge into Etoys/Squeak. For some time we will have to deal
> with two Etoys - Etoys/Etoys and the emerging Etoys/Squeak.
>
> So the Todo list will look like:
>   A. Excise Etoys/Squeak into a loadable package and unload it from the
> current Squeak trunk.
>   B. foreach Etoys changeset from Etoys/Etoys updates.list
>        apply it to this new package
>        load it in Squeak and make it pass a smoke test.
>   C. Rebase Etoys/Etoys to this new package.
>
> I get stuck in Step A. Where does one draw the boundary between Morphic and
> Etoys? Does one have to start from scratch or is there a partially excised
> version somewhere?
>
> BTW, I do like the Karl's proposal to have two images - etoys-dev and etoys
> (runtime). Runtime image should not be burdened with scaffolding code.
>
> Subbu
>

Loading the change sets into trunk and resolving all conflicts is also
a way of doing it.

Etoys is a seperate package in trunk image that can be unloaded, btw


Karl