merging latest polymorph

> On Wed, Aug 5, 2009 at 11:18 AM, Stéphane
> Ducasse<[hidden email]> wrote:
>> Hi adrian
>>
>> I got some problems when merging the latest polymorph (_ fixes).
>> I got conflicts when there should be none. I simply got revision
>> changed.
>> Did you already experience that?
>
> You may want to try _loading_ again the version from the Pharo
> repository and then _merging_ with the other repository.
>
> --
> Damien Cassou
> http://damiencassou.seasidehosting.st
>
> "Lambdas are relegated to relative obscurity until Java makes them
> popular by not having them." James Iry
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

> Ok I will try
>
> What I did was to click on all the use incoming version and at the end
> (at 5 left items)
> it just looped for ever. I had the redo the use incoming version but
> the number of conflicts
> stayed the same for ever 5.
> So far I could merge Polymorph-Widgets-gvc.70 but not Polymorph-
> Widgets-gvc.71
>
> Stef
>
> On Aug 5, 2009, at 12:08 PM, Damien Cassou wrote:
>
>> On Wed, Aug 5, 2009 at 11:18 AM, Stéphane
>> Ducasse<[hidden email]> wrote:
>>> Hi adrian
>>>
>>> I got some problems when merging the latest polymorph (_ fixes).
>>> I got conflicts when there should be none. I simply got revision
>>> changed.
>>> Did you already experience that?
>>
>> You may want to try _loading_ again the version from the Pharo
>> repository and then _merging_ with the other repository.
>>
>> --
>> Damien Cassou
>> http://damiencassou.seasidehosting.st
>>
>> "Lambdas are relegated to relative obscurity until Java makes them
>> popular by not having them." James Iry
>>
>> _______________________________________________
>> Pharo-project mailing list
>> [hidden email]
>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

> On Wed, Aug 5, 2009 at 11:18 AM, Stéphane
> Ducasse<[hidden email]> wrote:
>> Hi adrian
>>
>> I got some problems when merging the latest polymorph (_ fixes).
>> I got conflicts when there should be none. I simply got revision
>> changed.
>> Did you already experience that?
>
> You may want to try _loading_ again the version from the Pharo
> repository and then _merging_ with the other repository.
>
> --
> Damien Cassou
> http://damiencassou.seasidehosting.st
>
> "Lambdas are relegated to relative obscurity until Java makes them
> popular by not having them." James Iry
>
> _______________________________________________
> Pharo-project mailing list
> [hidden email]
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project