Re: Latest updates on CroquetSource hedgehogRC repository
Posted by
David Faught on
Sep 26, 2006; 7:37pm
URL: https://forum.world.st/Latest-updates-on-CroquetSource-hedgehogRC-repository-tp129428p129437.html
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
>