[squeak-dev] The Trunk: KernelTests-cmm.173.mcz

Levente Uzonyi leves at elte.hu
Fri Jan 7 17:38:19 UTC 2011


On Fri, 7 Jan 2011, Chris Muller wrote:

> Hmmm..  Levente was right, it didn't work, but I'm still really not
> sure why..!  Why can't we have an addition followed by removal in the
> same update?

Because there are two branches which will be merged automatically. Your 
branch doesn't add the FloatConsistencyTests, but the other branch does, 
so it appears in the merged version.

>
> Anyway, does trunk have a reverse gear?  I went ahead and moved
> KernelTests-ar.171 and 172 to the Inbox, so we can merge them back in
> to trunk once it represents 4.3.
>
> I hope this puts trunk back on on the 4.2 track.

This is a really bad idea, because all trunk images that have those 
packages loaded are now in an inconsistent state. Also the version number 
won't identify the exact set of packages in the image, because different 
images with the same version number can co-exist now.

The proper way to do this is to:
- move the versions ar.171 and 172 to the Trunk
- update your image
- remove all the stuff that you don't want to see in the image by hand
- save a new version to the Trunk with those changes

I'll do this ASAP.


Levente

>
> - Chris
>
>
> On Fri, Jan 7, 2011 at 10:30 AM,  <commits at source.squeak.org> wrote:
>> Chris Muller uploaded a new version of KernelTests to project The Trunk:
>> http://source.squeak.org/trunk/KernelTests-cmm.173.mcz
>>
>> ==================== Summary ====================
>>
>> Name: KernelTests-cmm.173
>> Author: cmm
>> Time: 7 January 2011, 10:29:46.085 am
>> UUID: e596c528-28a9-4198-82d6-6a69cee1ca33
>> Ancestors: KernelTests-cmm.169
>>
>> Resaving to gain highest version # for trunk update process.
>>
>> =============== Diff against KernelTests-cmm.169 ===============
>>
>>
>>
>
>



More information about the Squeak-dev mailing list