confused by rest local rest remote

[stéphane ducasse]

I think that I will need some help because I start to get really not  
making progress at all.


I took
     93
     loaded morphic splitter
     saved all the new packages

     took again a 93
     run the script
     I gto an ancestor not found, copy it to my local cache

     then I got a lot of conflicts.

now when

     SketchMorph subclass: #FatBitsPaint
     instanceVariableNames: 'formToEdit magnification brush brushSize  
brushColor lastMouse currentTools currentSelectionMorph  
selectionAnchor backgroundColor'
     classVariableNames: 'FormClipboard'
     poolDictionaries: ''
     category: 'MorphicExtras-AdditionalWidgets'  @@in red@@
     category: 'Morphic-Widgets'


now if I press rest local or rest remote I get the same !!!!
ie the changes are not taken into account

      SketchMorph subclass: #FatBitsPaint
     instanceVariableNames: 'formToEdit magnification brush brushSize  
brushColor lastMouse currentTools currentSelectionMorph  
selectionAnchor backgroundColor'
     classVariableNames: 'FormClipboard'
     poolDictionaries: ''
     category: 'Morphic-Widgets'

So let us say it.... I spent the last three days trying and for now I  
stop.

Stef


| vm names |
names _ '38Deprecated-sd.2.mcz
39Deprecated-sd.2.mcz
Balloon-stephaneducasse.8.mcz
BalloonMMFlash-stephaneducasse.1.mcz
Collections-stephaneducasse.30.mcz
CollectionsTests-md.8.mcz
Compiler-stephaneducasse.13.mcz
Compression-md.2.mcz
EToys-stephaneducasse.1.mcz
Exceptions-md.3.mcz
FFI-tbn.3.mcz
Files-stephaneducasse.9.mcz
FlexibleVocabularies-stephaneducasse.1.mcz
Graphics-stephaneducasse.14.mcz
GraphicsTests-md.3.mcz
Kernel-stephaneducasse.35.mcz
KernelTests-md.9.mcz
Morphic-stephaneducasse.48.mcz
MorphicExtras-stephaneducasse.1.mcz
MorphicTests-stephaneducasse.5.mcz
Movies-stephaneducasse.2.mcz
Multilingual-stephaneducasse.7.mcz
Nebraska-stephaneducasse.3.mcz
Network-stephaneducasse.18.mcz
NetworkTests-md.7.mcz
PackageInfo-md.3.mcz
PreferenceBrowser-hpt.27.mcz
Protocols-stephaneducasse.5.mcz
SMBase-stephaneducasse.70.mcz
SMLoader-md.26.mcz
ST80-stephaneducasse.20.mcz
SUnit-md.26.mcz
SmaCC-md.5.mcz
Sound-stephaneducasse.3.mcz
Speech-stephaneducasse.4.mcz
StarSqueak-stephaneducasse.3.mcz
System-stephaneducasse.44.mcz
ToolBuilder-Kernel-ar.13.mcz
ToolBuilder-MVC-ar.8.mcz
ToolBuilder-Morphic-md.15.mcz
ToolBuilder-SUnit-ar.9.mcz
Tools-stephaneducasse.33.mcz
VersionNumber-dew.1.mcz
' findTokens: ' ', String cr.

vm _ MCVersionMerger new.
names do: [:fn | vm addVersion: (MCCacheRepository default  
loadVersionFromFileNamed: fn)].
vm merge