Torsten,

> On 10 Feb 2015, at 13:22, Sven Van Caekenberghe <[email protected]> wrote:
> 
> Hi Torsten,
> 
> 
>> On 10 Feb 2015, at 13:18, Torsten Bergmann <[email protected]> wrote:
>> 
>> Hi Sven,
>> 
>> there is a Glorp-SvenVanCaekenberghe.93 from 22 January 2015, 12:40:38.42634 
>> pm
>> which does not seem to be based on the latest version at that time
>> (Glorp-TorstenBergmann.94, 16 January 2015) but is based on an older version
>> Glorp-EstebanMaringolo.92.
>> 
>> Will you reapply your changes or do a merge?
>> 
>> You can use a clean Pharo 4.0 and load Glorp right from the config browser.
>> 
>> Thx
>> T. 
> 
> Haha, as you know, it is quite hard to manipulate the Glorp package, it is 
> way too big (so it is a good idea that you try to do something about that). I 
> tried several times with out of memory errors, then I reran the VM with 
> higher memory settings, before committing my .93 version.
> 
> I will try to do a merge later on.

It went way easier than I remember, very weird. In any case, the merge is done:

===
Name: Glorp-SvenVanCaekenberghe.95
Author: SvenVanCaekenberghe
Time: 10 February 2015, 3:08:09.493595 pm
UUID: 03731890-b5f3-41e6-a1a8-89bff76b3796
Ancestors: Glorp-TorstenBergmann.94, Glorp-SvenVanCaekenberghe.93

Merging: TimeStamp is deprecated, use DataAndTime
===

Sven


Reply via email to