Mantis - Squeak Packages
Viewing Issue Advanced Details
1677 Shout minor always 08-15-05 11:31 08-15-05 15:54
Damien Cassou Mac OS X  
Mac OS X  
normal VM 3.8.6Beta6  
new  
Monticello-dew.263 open  
none    
none  
0001677: MCConflict does not understand isAddition
When I merge a package and there is a conflict in a method, if I click on the method in the Merging browser, I have a debug window : MessageNotUnderstood MCConflict>>isAddition
15 August 2005 10:34:40 am

VM: Mac OS - a SmalltalkImage
Image: Squeak3.9alpha [latest update: 0006678]

SecurityManager state:
Restricted: false
FileAccess: true
SocketAccess: true
Working Dir Data:Users:cassou:Documents:Squeak:3.9:working
Trusted Dir Data:Users:cassou:Documents:Squeak:3.9:working
Untrusted Dir foobar:tooBar:forSqueak:bogus

MCConflict(Object)>>doesNotUnderstand: #isAddition
    Receiver: a MCConflict
    Arguments and temporary variables:
        aMessage: isAddition
    Receiver's instance variables:
        operation: a MCModification
        chooseRemote: true

MCMergeBrowser(MCPatchBrowser)>>shoutAboutToStyle:
    Receiver: a MCMergeBrowser
    Arguments and temporary variables:
        aPluggableShoutMorphOrView: a PluggableShoutMorph(396)
    Receiver's instance variables:
        morph: a SystemWindow(3436)
        label: 'Merging Magritte-All-lr.33'
        modal: true
        modalValue: nil
        items: a SortedCollection(a MCModification a MCModification a MCModification a ...etc...
        selection: a MCConflict
        conflicts: an OrderedCollection(a MCConflict)
        merger: a MCThreeWayMerger
        ok: nil

PluggableShoutMorph>>okToStyle
    Receiver: a PluggableShoutMorph(396)
    Arguments and temporary variables:

    Receiver's instance variables:
        bounds: 798@367 corner: 1188@553
        owner: a SystemWindow(3436)
        submorphs: an Array(a ScrollBar(1835) a TransformMorph(43))
        fullBounds: 798@367 corner: 1188@553
        color: Color white
        extension: a MorphExtension (2881) [locked] [other: (vScrollBarAlways -> true...etc...
        borderWidth: 1
        borderColor: Color lightGray
        model: a MCMergeBrowser
        slotName: nil
        open: false
        pinSpecs: nil
        scrollBar: a ScrollBar(1835)
        scroller: a TransformMorph(43)
        retractableScrollBar: false
        scrollBarOnLeft: false
        getMenuSelector: nil
        getMenuTitleSelector: nil
        scrollBarHidden: nil
        hasFocus: false
        hScrollBar: a ScrollBar(2987)
        textMorph: a TextMorphForShout(3269)
        getTextSelector: #text
        setTextSelector: #text:
        getSelectionSelector: nil
        hasUnacceptedEdits: false
        askBeforeDiscardingEdits: true
        selectionInterval: (1 to: 0)
        hasEditingConflicts: false
        styler: a SHTextStylerST80
        unstyledAcceptText: nil

PluggableShoutMorph>>setText:
    Receiver: a PluggableShoutMorph(396)
    Arguments and temporary variables:
        aText: a Text for 'renderViewerOn: html
    self value isNil ifTrue: [ ^ self ].
...etc...
    Receiver's instance variables:
        bounds: 798@367 corner: 1188@553
        owner: a SystemWindow(3436)
        submorphs: an Array(a ScrollBar(1835) a TransformMorph(43))
        fullBounds: 798@367 corner: 1188@553
        color: Color white
        extension: a MorphExtension (2881) [locked] [other: (vScrollBarAlways -> true...etc...
        borderWidth: 1
        borderColor: Color lightGray
        model: a MCMergeBrowser
        slotName: nil
        open: false
        pinSpecs: nil
        scrollBar: a ScrollBar(1835)
        scroller: a TransformMorph(43)
        retractableScrollBar: false
        scrollBarOnLeft: false
        getMenuSelector: nil
        getMenuTitleSelector: nil
        scrollBarHidden: nil
        hasFocus: false
        hScrollBar: a ScrollBar(2987)
        textMorph: a TextMorphForShout(3269)
        getTextSelector: #text
        setTextSelector: #text:
        getSelectionSelector: nil
        hasUnacceptedEdits: false
        askBeforeDiscardingEdits: true
        selectionInterval: (1 to: 0)
        hasEditingConflicts: false
        styler: a SHTextStylerST80
        unstyledAcceptText: nil


--- The full stack ---
MCConflict(Object)>>doesNotUnderstand: #isAddition
MCMergeBrowser(MCPatchBrowser)>>shoutAboutToStyle:
PluggableShoutMorph>>okToStyle
PluggableShoutMorph>>setText:
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PluggableShoutMorph(PluggableTextMorph)>>update:
[] in MCMergeBrowser(Object)>>changed: {[:aDependent | aDependent update: aParameter]}
DependentsArray>>do:
MCMergeBrowser(Object)>>changed:
MCMergeBrowser>>chooseAllUnchosenRemote
MCMergeBrowser(MCTool)>>performButtonAction:enabled:
PluggableButtonMorph>>performAction
[] in PluggableButtonMorph>>mouseUp: {[:m | (m containsPoint: evt cursorPoint) ifTrue: [m performAction]]}
Array(SequenceableCollection)>>do:
PluggableButtonMorph>>mouseUp:
PluggableButtonMorph(Morph)>>handleMouseUp:
MouseButtonEvent>>sentTo:
PluggableButtonMorph(Morph)>>handleEvent:
PluggableButtonMorph(Morph)>>handleFocusEvent:
[] in HandMorph>>sendFocusEvent:to:clear: {[ActiveHand := self. ActiveEvent := anEvent. result := focusHolder han...]}
...etc...

Notes
(0002337)
Damien Cassou   
08-15-05 11:35   
In the same method MCPatchBrowser>>shoutAboutToStyle: there is another call which is not understood : 'selection isRemoval'
(0002340)
bert   
08-15-05 15:54   
This is actually a Shout problem: moved to Shout category