Re: Can't merge Aida 6.0 over Aida6.0 beta 2

Hi Janko,

JM> It seems that this problem is now solved, just load Aida6.0-final.1000.mcz.

so I did the merge and the merging worked just fine by manually
editing the conflicting methods to accommodate my and your changes and
rejecting the change in MC's merge browser. Would have been less
clumsy if I could have done it in MC )

So I'm now using current Aida, thanks!

This broke my app due to the fact that DefaultWebStyle>>htmlHeaderElements
now reads: self app context page addMetaDescription
instead of self app addMetaDescription

I use my own WebStyle with my own meta information so I overwrote that
method.

For the same reason my own two ensureJavascriptFor... methods broke.

For the same reason AidaCharts would break. I'll update it today.

Dunno about Scribo, don't use it.

Regarding that change WebRichEditor>>ensureJavascriptForEditor...
does not follow this rule but it only reads:
page := self context page. (no app)

Is this ok or did it slip thru? I don't use RichEditor.

Cheers,

Herbert                            mailto:herbertkoenig <at> gmx.net

JM> On 02. 12. 2009 09:03, Herbert König wrote:
>> Hi,
>> 
>> taking a fresh image and loading the three mcz for 6.0 beta2 works
>> fine. As I have made changes I want to merge 6.0.
>> 
>> The message is that the ancestor (beta2) can't be found.
>> 
>> This was in Squeak 3.8
>> 
>> In Squeak 3.10 Monticello doesn't even see Aida6.0.mcz. I reloaded it
>> freshly from Squeaksource, same result.
>> 
>> Loading (instead of merging) works, except that in 3.10 Monticello
>> still states beta 2 as the current version.
>> 
>> Any hints?
>> 
>> Cheers,
>> 
>> Herbert                          mailto:herbertkoenig <at> gmx.net