Smalltalk › Squeak › Croquet › Croquet - Dev 2

Latest updates on CroquetSource hedgehogRC repository

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

12 messages Options

David Faught

Latest updates on CroquetSource hedgehogRC repository

Hi,

First of all, thanks for the updates. There are some parts of my life
that I LIKE changes in.

Now for the questions:

1. When I try to merge the Croquet-Objects-ar.229 package, the
Merging window that comes up has the Merge button greyed out and the
top two items to merge are highlighted, "TMaterial (changed)" and
"TMaterial>>disable: (changed)".

2. When I try to merge the Croquet-Window-das.22 package, I get a
warning that "This package depends on the following classes:
TUpdatingMesh You must resolve these dependencies before you will be
able to load these definitions: ..."

3. It appears that there are some new projects, Croquet-Embed,
Croquet-Import, and Croquet-Menus.

What should I do with these?

Andreas.Raab

Re: Latest updates on CroquetSource hedgehogRC repository

Hi David -

You're too quick ;-) I haven't even gotten feedback from the consortium
that's why I haven't mentioned anything on the list. First, couple of
notes: If you load the latest changes, make sure you load them in the
right order. FIRST: Update the Monticello package from the homebase
repository. SECOND: Update homebase and tweak since we rely on some of
the fixes in there. THIRD: Load the new packages from the hedgehog
repository (necessary since we did some restructuring and loading in a
different order will cause issues later on). FOURTH: Update everything else.

Now on to your questions:
> 1. When I try to merge the Croquet-Objects-ar.229 package, the
> Merging window that comes up has the Merge button greyed out and the
> top two items to merge are highlighted, "TMaterial (changed)" and
> "TMaterial>>disable: (changed)".

That is the normal way merge works. It shows you all the modifications
but you can only change the conflicts (if any; displayed in bold). Just
say "merge" again to install the changes.

> 2. When I try to merge the Croquet-Window-das.22 package, I get a
> warning that "This package depends on the following classes:
> TUpdatingMesh You must resolve these dependencies before you will be
> able to load these definitions: ..."

A load order dependency. Update Croquet-Objects first.

> 3. It appears that there are some new projects, Croquet-Embed,
> Croquet-Import, and Croquet-Menus.
>
> What should I do with these?

Load them first (see above).

Cheers,
- Andreas

David Faught

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by David Faught

Hi Andreas,

Thanks for your response. I can wait for list announcements before I
try new changes if you would prefer. Or at least before I ask
questions about them.

I think that something else is required for item 1 because I can't
just click on Merge - it is greyed out. Do I need to "Keep" each of
the highlighted conflicts in order to proceed with the Merge?

On 9/26/06, Andreas Raab <[hidden email]> wrote:

> Hi David -
>
> You're too quick ;-) I haven't even gotten feedback from the consortium
> that's why I haven't mentioned anything on the list. First, couple of
> notes: If you load the latest changes, make sure you load them in the
> right order. FIRST: Update the Monticello package from the homebase
> repository. SECOND: Update homebase and tweak since we rely on some of
> the fixes in there. THIRD: Load the new packages from the hedgehog
> repository (necessary since we did some restructuring and loading in a
> different order will cause issues later on). FOURTH: Update everything else.
>
> Now on to your questions:
> > 1. When I try to merge the Croquet-Objects-ar.229 package, the
> > Merging window that comes up has the Merge button greyed out and the
> > top two items to merge are highlighted, "TMaterial (changed)" and
> > "TMaterial>>disable: (changed)".
>
> That is the normal way merge works. It shows you all the modifications
> but you can only change the conflicts (if any; displayed in bold). Just
> say "merge" again to install the changes.
>
> > 2. When I try to merge the Croquet-Window-das.22 package, I get a
> > warning that "This package depends on the following classes:
> > TUpdatingMesh You must resolve these dependencies before you will be
> > able to load these definitions: ..."
>
> A load order dependency. Update Croquet-Objects first.
>
> > 3. It appears that there are some new projects, Croquet-Embed,
> > Croquet-Import, and Croquet-Menus.
> >
> > What should I do with these?
>
> Load them first (see above).
>
> Cheers,
> - Andreas
>

SnapShot053.png (22K) Download Attachment

Andreas.Raab

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by David Faught

David Faught wrote:
> Thanks for your response. I can wait for list announcements before I
> try new changes if you would prefer. Or at least before I ask
> questions about them.

No problem, you were just a little faster than I expect (and the
consortium a little slower ;-)

> I think that something else is required for item 1 because I can't
> just click on Merge - it is greyed out. Do I need to "Keep" each of
> the highlighted conflicts in order to proceed with the Merge?

Ah, yes. If you have selectors displayed in bold it means you have
conflicting changes and need to decide whether to "keep" the incoming
change or to "reject" the incoming change (and I *hate* these terms, and
hopefully I got them right this time). You can only proceed with the
merge once you've decided how to deal with the conflicts. Notice that
often the "rest local" or "rest remote" buttons are what you really
want. The first one (rest local) means "I want my local changes to
prevail" whereas the latter says "I want what's current in the repository".

Cheers,
- Andreas

David Faught

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by David Faught

So in this case, in order to keep your incoming changes, I am
essentially rejecting the previous fix from Mark McCahill that has the
comment "Peter Moores fix to the TMaterial>>disable: method to change
from DefaultEmission to DefaultEmissive"

That doesn't sound like a good thing to do.

> > I think that something else is required for item 1 because I can't
> > just click on Merge - it is greyed out. Do I need to "Keep" each of
> > the highlighted conflicts in order to proceed with the Merge?
>
> Ah, yes. If you have selectors displayed in bold it means you have
> conflicting changes and need to decide whether to "keep" the incoming
> change or to "reject" the incoming change (and I *hate* these terms, and
> hopefully I got them right this time). You can only proceed with the
> merge once you've decided how to deal with the conflicts. Notice that
> often the "rest local" or "rest remote" buttons are what you really
> want. The first one (rest local) means "I want my local changes to
> prevail" whereas the latter says "I want what's current in the repository".

Andreas.Raab

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by David Faught

Andreas Raab wrote:
> Ah, yes. If you have selectors displayed in bold it means you have
> conflicting changes and need to decide whether to "keep" the incoming
> change or to "reject" the incoming change (and I *hate* these terms, and
> hopefully I got them right this time).

Okay, and I just decided to fix it. If you update Monticello from the
homebase repository it will now read "keep local" and "keep remote"
which is hopefully more clear than "keep" and "reject".

Cheers,
- Andreas

Andreas.Raab

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by David Faught

Oops, my bad. In the process of submitting two dozen changes yesterday I
overlooked this particular package. I just posted another version which
merges the changes, you should be able to load this one without the
merge conflicts.

Cheers,
- Andreas

David Faught wrote:

> So in this case, in order to keep your incoming changes, I am
> essentially rejecting the previous fix from Mark McCahill that has the
> comment "Peter Moores fix to the TMaterial>>disable: method to change
> from DefaultEmission to DefaultEmissive"
>
> That doesn't sound like a good thing to do.
>
>> > I think that something else is required for item 1 because I can't
>> > just click on Merge - it is greyed out. Do I need to "Keep" each of
>> > the highlighted conflicts in order to proceed with the Merge?
>>
>> Ah, yes. If you have selectors displayed in bold it means you have
>> conflicting changes and need to decide whether to "keep" the incoming
>> change or to "reject" the incoming change (and I *hate* these terms, and
>> hopefully I got them right this time). You can only proceed with the
>> merge once you've decided how to deal with the conflicts. Notice that
>> often the "rest local" or "rest remote" buttons are what you really
>> want. The first one (rest local) means "I want my local changes to
>> prevail" whereas the latter says "I want what's current in the
>> repository".
>
>

SuslovNikolay

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by David Faught

Dear, Andreas
Does it mean, that to be updated correctly I need to install MetaCroquet-Classes-ar.1.mcz from MetaCroquet (or something else)?
As after all updates I have an error (during initializing):
----
AnObsoleteTLoadMDL(Object)>>doesNotUnderstand:
TAvatarUser>>loadAvatar:
CroquetHarnessWithMenu(CroquetHarness)>>initialize
...
----

Thanks,
Nikolay

Andreas.Raab

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by David Faught

Hi Nikolay,

Generally, if you don't understand what we mean, then don't do it ;-)
There will be another release which has all that stuff properly included
and what you're getting right now comes with the disclaimer "some
assembly required". If you don't feel like you can do the assembly on
your own, wait for the next release.

Having said that, however, let me explain what I mean: We are talking
about two things, repositories and packages. We have currently four
"official" repositories which are present in the Monticello browser by
default. Their respective names and urls are:

- Homebase: This is the repository for all the Squeak base packages.
http://hedgehog.software.umn.edu:8888/Homebase

- Tweak: This is the repository for all the Tweak packages.
http://hedgehog.software.umn.edu:8888/Tweak

- Hedgehog: This is the repository for all the core Croquet packages.
http://hedgehog.software.umn.edu:8888/hedgehogRC

- Contributions: The repository for all the contributed packages.
http://hedgehog.software.umn.edu:8888/Contributions

Within these four packages you should generally update "top-to-bottom",
e.g., first homebase, then tweak, then hedgehog, then contribs. There
are some additional internal dependencies like I said initially, for
example you need to load the Monticello changes before you can load the
Compiler changes in the Homebase repository, and you need to load the
new packages in the Hedgehog repository before the changed packages.

Based on this information it should be clear that you *don't* have to
load anything from MetaCroquet since it is an entirely different
repository which has nothing to do with the "standard" Croquet distribution.

In addition, the error message you are seeing is the precise result of
loading the packages in the wrong order. In this case you updated the
Croquet-Objects package before loading (the new) Croquet-Import package.
Switch the order, e.g., load the new Croquet-Import package before
updating the Croquet-Objects package and all will be fine.

Cheers,
- Andreas

nsuslovi wrote:

> Dear, Andreas
> Does it mean, that to be updated correctly I need to install MetaCroquet-Classes-ar.1.mcz from MetaCroquet (or something else)?
> As after all updates I have an error (during initializing):
> ----
> AnObsoleteTLoadMDL(Object)>>doesNotUnderstand:
> TAvatarUser>>loadAvatar:
> CroquetHarnessWithMenu(CroquetHarness)>>initialize
> ...
> ----
>
> Thanks,
> Nikolay
>
>

Derek O'Connell

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by SuslovNikolay

I also get this error but, being new, I did not know that updates had to be done in a specific order. In fact I thought dependencies were handled by monticello. I am making another attempt to update Croquet in a minute.

SuslovNikolay wrote

Dear, Andreas
Does it mean, that to be updated correctly I need to install MetaCroquet-Classes-ar.1.mcz from MetaCroquet (or something else)?
As after all updates I have an error (during initializing):
----
AnObsoleteTLoadMDL(Object)>>doesNotUnderstand:
TAvatarUser>>loadAvatar:
CroquetHarnessWithMenu(CroquetHarness)>>initialize
...
----

Thanks,
Nikolay

Bert Freudenberg

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by David Faught

Am 26.09.2006 um 21:00 schrieb Andreas Raab:

> Andreas Raab wrote:
>> Ah, yes. If you have selectors displayed in bold it means you have
>> conflicting changes and need to decide whether to "keep" the
>> incoming change or to "reject" the incoming change (and I *hate*
>> these terms, and hopefully I got them right this time).
>
> Okay, and I just decided to fix it. If you update Monticello from
> the homebase repository it will now read "keep local" and "keep
> remote" which is hopefully more clear than "keep" and "reject".

Uh oh ... renaming the buttons is fine, but I strongly advocate
against changing their order. Muscle memory, you know?

Also "choose remote" and "keep local" might be even clearer. Or
simply "use remote" and "use local"? Anyway, the "remote" and "local"
terms are much better than before.

- Bert -

SuslovNikolay

Re: Latest updates on CroquetSource hedgehogRC repository

In reply to this post by David Faught

Thanks, Andreas
.it works!

Best regards,
Nikolay

>Hi Nikolay,
>
>Generally, if you don't understand what we mean, then don't do it ;-)
>There will be another release which has all that stuff properly included
>and what you're getting right now comes with the disclaimer "some
>assembly required". If you don't feel like you can do the assembly on
>your own, wait for the next release.
>
>Having said that, however, let me explain what I mean: We are talking
>about two things, repositories and packages. We have currently four
>"official" repositories which are present in the Monticello browser by
>default. Their respective names and urls are:
>
>- Homebase: This is the repository for all the Squeak base packages.
> http://hedgehog.software.umn.edu:8888/Homebase
>
>- Tweak: This is the repository for all the Tweak packages.
> http://hedgehog.software.umn.edu:8888/Tweak
>
>- Hedgehog: This is the repository for all the core Croquet packages.
> http://hedgehog.software.umn.edu:8888/hedgehogRC
>
>- Contributions: The repository for all the contributed packages.
> http://hedgehog.software.umn.edu:8888/Contributions
>
>Within these four packages you should generally update "top-to-bottom",
>e.g., first homebase, then tweak, then hedgehog, then contribs. There
>are some additional internal dependencies like I said initially, for
>example you need to load the Monticello changes before you can load the
>Compiler changes in the Homebase repository, and you need to load the
>new packages in the Hedgehog repository before the changed packages.
>
>Based on this information it should be clear that you *don't* have to
>load anything from MetaCroquet since it is an entirely different
>repository which has nothing to do with the "standard" Croquet distribution.
>
>In addition, the error message you are seeing is the precise result of
>loading the packages in the wrong order. In this case you updated the
>Croquet-Objects package before loading (the new) Croquet-Import package.
>Switch the order, e.g., load the new Croquet-Import package before
>updating the Croquet-Objects package and all will be fine.
>
>Cheers,
> - Andreas
>
>nsuslovi wrote:
>> Dear, Andreas
>> Does it mean, that to be updated correctly I need to install MetaCroquet-Classes-ar.1.mcz from MetaCroquet (or something else)?
>> As after all updates I have an error (during initializing):
>> ----
>> AnObsoleteTLoadMDL(Object)>>doesNotUnderstand:
>> TAvatarUser>>loadAvatar:
>> CroquetHarnessWithMenu(CroquetHarness)>>initialize
>> ...
>> ----
>>
>> Thanks,
>> Nikolay
>>
>>
>