Found the problem. A missing return in 
MCMergeResolutionRequest>>defaultAction.
I'll update SqueakSource now with a new Polymorph-Tools-Diff.

Regards, Gary


----- Original Message ----- 
From: "Stéphane Ducasse" <[email protected]>
To: <[email protected]>
Sent: Saturday, February 07, 2009 10:47 AM
Subject: Re: [Pharo-project] Strange merge behavior


Apparently it is working with 10218 but not 10222 :(

So I will try to find some time. But I do not have. I spent 2 hours
already trying to integrate
the changes of gary and alain => nothing.

Stef frustrated

On Feb 7, 2009, at 11:23 AM, Stéphane Ducasse wrote:

> from time to time when I click on a bold package and merge it
> I get the merge tool then I press merge and nothing happen.
> I have to load the package to load it.
>
> Stef
>
> _______________________________________________
> Pharo-project mailing list
> [email protected]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>


_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project 


_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

Reply via email to