confused by rest local rest remote

[stéphane ducasse]

But markus
I would like to have a script that contains ***ALL*** the squeak  
packages and not only the last
ones that have been marked dirty.

This is why I included all the packages in my script.
Can you try to do the same experience than me:

     93
     + MC274
     + loading **all the packages**


Else I do not really see how we will be able to build a given version  
without having to create the previous ones.

Stef


On 27 sept. 05, at 20:02, Daniel Vainsencher wrote:

> Ok, good to know this works for someone other than Avi and I...
>
> About the dialog:
> Actually, MCConfiguration>>upgrade shows the way. The relevant  
> piece is:
>
> [ver merge]
>     on: MCMergeResolutionRequest do: [:request |
>         request merger conflicts isEmpty
>             ifTrue: [request resume: true]
>             ifFalse: [request pass]]
>
> We want ver to be the merger, instead of the version.
>
> So I started to change MCConfigs to use a combination of the script  
> and
> this element, but I went down a wrong path somewhere in there, don't
> think its worth continuing from.
>
> Daniel
>
> Marcus Denker wrote:
>
>> Am 27.09.2005 um 11:06 schrieb Avi Bryant:
>>
>>>
>>> On Sep 27, 2005, at 12:36 AM, stéphane ducasse wrote:
>>>
>>>
>>>>
>>>> I think that this is normal that you did not got any problem   
>>>> anymore since everything was already loaded in the image I sent  
>>>> you.
>>>> Now take a 93 image and load the script you did or load the  
>>>> script  I did with all the packages (not only the modified ones)  
>>>> and you  should get conflicts as I did (normally you will obtain  
>>>> the same  image that the one I provided to you and this one  
>>>> report conflicts).
>>>>
>>>>
>>>
>>> Nope.  It worked just fine for me.  Maybe it only works on this   
>>> side of the Pacific.
>>>
>>> Here's what I did:
>>>
>>> - Start with the Squeak3.9a-6693.image
>>> - Load Monticello-avi.274.mcz
>>> - Run the script below
>>>
>>> Then wait a really long time, hit Merge, wait a really long time   
>>> again... and you're done.
>>>
>>>
>> Yes, worked for me, too.
>> The new packages are marked dirty, I think this is related to the   
>> fact that they don't have
>> the 39a repository defined (they only have the local cache). So  
>> we  need to somehow
>> fix that.
>> How do we proceed? If we put a cs with Avi's code out into the  
>> update  stream, the
>> users would need to press the "merge" button. The question is if  
>> we  want that...
>>   Marcus
>