<div dir="ltr">If you click on the squeak icon, left of top menu bar, it's also the second item.<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">2013/9/22 Bob Arning <span dir="ltr"><<a href="mailto:arning315@comcast.net" target="_blank">arning315@comcast.net</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div bgcolor="#FFFFFF" text="#000000">
<font face="Georgia">Nothing really needs to be done - it was the
same change. I needed to make it first to get the help menu in
order to update to your version.<br>
<br>
</font><div><div class="h5">
<div>On 9/21/13 6:00 PM, Nicolas Cellier
wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">
<div>
<div>
<div>It means that we both changed the same method, so there
is a merge conflict.<br>
</div>
<div>Right now, the method for resolving is binary:<br>
</div>
If you say keep, then you accept the incoming version to
replace your version.<br>
</div>
If you say reject, then refuse the incoming version and prefer
to keep your own version.<br>
</div>
I guess that you'll want to manually merge our both changes once
the load is complete.<br>
</div>
<div class="gmail_extra">
<br>
<br>
<div class="gmail_quote">2013/9/21 Bob Arning <span dir="ltr"><<a href="mailto:arning315@comcast.net" target="_blank">arning315@comcast.net</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div bgcolor="#FFFFFF" text="#000000"> <font face="Georgia">Ran
mostly without problem. Got one of those monticello
merge-whatever windows complaining about
TheWorldMenu>>soundEnablingString. I clicked keep
and merge and it went away. Whatever that means.<br>
<br>
Cheers,<br>
Bob<br>
<br>
<br>
</font>
<div>
<div>
<div>On 9/21/13 5:38 PM, Nicolas Cellier wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">
<div>
<div>
<div>So <font face="Georgia">Monticello-nice.571
is using a message added in
Compiler-nice.270<br>
So does </font><font face="Georgia">Kernel-nice.808</font></div>
<font face="Georgia">That means that I should
have placed </font><font face="Georgia">Compiler-nice.270
in an intermediate update or higher in the
package order...<br>
</font></div>
<font face="Georgia">I just republished
update-nice.246.mcm with Compiler raised two
places abaove (above Monticello and Kernel).<br>
</font></div>
<font face="Georgia">Could you retry?<br>
</font></div>
<div class="gmail_extra"> <br>
<br>
<div class="gmail_quote">2013/9/21 Nicolas Cellier
<span dir="ltr"><<a href="mailto:nicolas.cellier.aka.nice@gmail.com" target="_blank">nicolas.cellier.aka.nice@gmail.com</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">
<div>Ah, probably a problem with load order.<br>
</div>
<div>I will check that.<br>
</div>
</div>
<div>
<div>
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote">2013/9/21 Bob
Arning <span dir="ltr"><<a href="mailto:arning315@comcast.net" target="_blank">arning315@comcast.net</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div bgcolor="#FFFFFF" text="#000000"> <font face="Georgia"><br>
========== Graphics-tpr.225
==========<br>
<br>
An attempt to improve the
comment for BitBlt; it was very
out of date (no Patterns or
MAskedForms in image now) and
more than a bit confusing in
places. Hopefully this is less
so.<br>
<br>
========== Monticello-nice.571
==========<br>
<br>
Don't pass a category to a
Compiler, classifying is not its
job.<br>
<br>
>>> Monticello-nice.570
<<<<br>
Now that the SyntaxError
restarts the existing Compiler
process rather than substitute
to it, it is possible to edit
method with incorrect syntax in
the SyntaxError and continue MC
Loading/Merging.<br>
<br>
Though, we should log the
corrected code, not the
syntaxically incorrect one, and
for that we let MethodAddition
intercept the
SyntaxErrorNotification so as to
retrieve its corrected
newSource.<br>
<br>
========== Kernel-nice.808
==========<br>
<br>
Don't pass a category to a
Compiler, classifying is not its
job.<br>
<br>
>>> Kernel-nice.807
<<<<br>
If you just need the parameter
names, then just ask for the
parameter names.<br>
Asking for parameter and temp
names, then throwing the temps
away sounds like not using the
right API in the right place...<br>
<br>
========== Graphics-tpr.225
==========<br>
<br>
An attempt to improve the
comment for BitBlt; it was very
out of date (no Patterns or
MAskedForms in image now) and
more than a bit confusing in
places. Hopefully this is less
so.<br>
<br>
========== Monticello-nice.571
==========<br>
<br>
Don't pass a category to a
Compiler, classifying is not its
job.<br>
<br>
>>> Monticello-nice.570
<<<<br>
Now that the SyntaxError
restarts the existing Compiler
process rather than substitute
to it, it is possible to edit
method with incorrect syntax in
the SyntaxError and continue MC
Loading/Merging.<br>
<br>
Though, we should log the
corrected code, not the
syntaxically incorrect one, and
for that we let MethodAddition
intercept the
SyntaxErrorNotification so as to
retrieve its corrected
newSource.<br>
<br>
========== Kernel-nice.808
==========<br>
<br>
Don't pass a category to a
Compiler, classifying is not its
job.<br>
<br>
>>> Kernel-nice.807
<<<<br>
If you just need the parameter
names, then just ask for the
parameter names.<br>
Asking for parameter and temp
names, then throwing the temps
away sounds like not using the
right API in the right place...<br>
<br>
......then a walkback
(attached)..........<br>
<br>
Cheers,<br>
Bob<br>
</font> </div>
<br>
<br>
<br>
</blockquote>
</div>
<br>
</div>
</div>
</div>
</blockquote>
</div>
<br>
</div>
<br>
<fieldset></fieldset>
<br>
</blockquote>
<br>
</div>
</div>
</div>
<br>
<br>
<br>
</blockquote>
</div>
<br>
</div>
<br>
<fieldset></fieldset>
<br>
<pre></pre>
</blockquote>
<br>
</div></div></div>
<br><br>
<br></blockquote></div><br></div>