Re: [squeak-smalltalk/squeak-object-memory] Bad example in Terse Guide (fractionPart) (Issue #130)

--Apple-Mail=_C6FE46E1-1ED4-4EB4-85F3-4D6EAAE3C299
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=utf-8

(Cc:d to main list after the original somehow got mixed up in =
object-memory?)

> On Aug 4, 2026, at 1:13=E2=80=AFPM, squeak-smalltalk-bot =
<[email protected]> wrote:
> Did an update of my rc2 image and during the processing of =
System-mt.1530 the conflict browser opened - not surprising since I had =
made changes relating to the SpaceTally bug.
> Selecting the first item - SpaceTally class>#initialize & =
=E2=80=98accept=E2=80=99ing it was no problem.
>=20
> Selecting =E2=80=98all newer=E2=80=99 raised a dNU: because =
MCConflict>>#isLocalNewer claims the =E2=80=99self localDefinition=E2=80=99=
 returns nil. Since the operation involved is an MCAddition, and they =
always return nil to #baseDefinition, this seems like a problem

>=20
>  I=E2=80=99m reasonably sure the test for isLocal/RemoteNewer really =
ought to be delegated to the actual operation. Currently it is written =
unpleasantly like Python code.

Suggestion for smallest practical fix -=20

--Apple-Mail=_C6FE46E1-1ED4-4EB4-85F3-4D6EAAE3C299
Content-Disposition: attachment;
	filename=MCConflict-rc2-bug.1.cs
Content-Type: application/octet-stream;
	x-unix-mode=0600;
	name="MCConflict-rc2-bug.1.cs"
Content-Transfer-Encoding: quoted-printable

=EF=BB=BF'=46rom=20Squeak6.1rc2=20of=202=20August=202026=20[latest=20=
update:=20#23945]=20on=204=20August=202026=20at=203:21:49=20pm'!=0D=
"Change=20Set:=09=09MCConflict-rc2-bug=0DDate:=09=09=094=20August=202026=0D=
Author:=09=09=09tim=20Rowledge=0D=0DDelegate=20the=20method=20timestamp=20=
testing=20to=20the=20MCPatchOperation=20created=20when=20parsing=20a=20=
changeset"!=0D=0D=0D!MCConflict=20methodsFor:=20'testing'=20stamp:=20=
'tpr=208/4/2026=2015:19'!=0DisLocalNewer=0D=0D=09^operation=20=
isLocalNewer!=20!=0D=0D!MCConflict=20methodsFor:=20'testing'=20stamp:=20=
'tpr=208/4/2026=2015:19'!=0DisRemoteNewer=0D=0D=09^operation=20=
isRemoteNewer!=20!=0D=0D=0D!MCPatchOperation=20methodsFor:=20'testing'=20=
stamp:=20'tpr=208/4/2026=2015:02'!=0DisLocalNewer=0D=09"is=20the=20local=20=
version=20is=20newer=20than=20the=20remote?"=0D=0D=09^=20(self=20=
baseDefinition=20fullTimeStamp=20ifNil:=20[^=20false])=20>=20self=20=
targetDefinition=20fullTimeStamp!=20!=0D=0D!MCPatchOperation=20=
methodsFor:=20'testing'=20stamp:=20'tpr=208/4/2026=2015:02'!=0D=
isRemoteNewer=0D=09"is=20the=20remote=20version=20newer=20than=20the=20=
local=20one?"=0D=0D=09^=20(self=20baseDefinition=20fullTimeStamp=20=
ifNil:=20[^=20false])=20<=20self=20targetDefinition=20fullTimeStamp!=20!=0D=
=0D=0D!MCAddition=20methodsFor:=20'testing'=20stamp:=20'tpr=208/4/2026=20=
15:17'!=0DisLocalNewer=0D=09"if=20we=20are=20adding=20a=20method,=20the=20=
local=20version=20is=20never=20newer"=0D=0D=09^false!=20!=0D=0D=
!MCAddition=20methodsFor:=20'testing'=20stamp:=20'tpr=208/4/2026=20=
15:16'!=0DisRemoteNewer=0D=09"if=20we=20are=20adding=20a=20method,=20the=20=
remote=20version=20is=20always=20newer"=0D=0D=09^true!=20!=0D=0D=0D=
!MCRemoval=20methodsFor:=20'testing'=20stamp:=20'tpr=208/4/2026=20=
15:09'!=0DisLocalNewer=0D=09"if=20we=20are=20removing=20a=20method,=20=
the=20local=20version=20is=20never=20newer"=0D=0D=09^false!=20!=0D=0D=
!MCRemoval=20methodsFor:=20'testing'=20stamp:=20'tpr=208/4/2026=20=
15:09'!=0DisRemoteNewer=0D=09"if=20we=20are=20removing=20a=20method,=20=
the=20remote=20version=20is=20always=20newer"=0D=0D=09^true!=20!=0D=0D=

--Apple-Mail=_C6FE46E1-1ED4-4EB4-85F3-4D6EAAE3C299
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii


MCConflict>>#chooseNewer & #chooseOlder look a bit weird. Is it actually =
possible for a method to be neither older nor newer?=20
MCConflict>>#chooseSameAST is very Python-ugly; just delegate to the =
damn operation!

tim
--
tim Rowledge; [email protected]; http://www.rowledge.org/tim
Useful random insult:- Calls people to ask them their phone number.



--Apple-Mail=_C6FE46E1-1ED4-4EB4-85F3-4D6EAAE3C299
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Squeak-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
--Apple-Mail=_C6FE46E1-1ED4-4EB4-85F3-4D6EAAE3C299--