I pressed on next conflict.
Stef
9 March 2009 1:45:36 pm
VM: Mac OS - a SmalltalkImage
Image: Pharo0.1 [Latest update: #10248]
SecurityManager state:
Restricted: false
FileAccess: true
SocketAccess: true
Working Dir
/Users/ducasse/Workspace/FirstCircle/ActiveResearch/Pharo/Pharo
Trusted Dir /foobar/tooBar/forSqueak/bogus
Untrusted Dir /Users/ducasse/Library/Preferences/Squeak/Internet/My
Squeak
UndefinedObject(Object)>>doesNotUnderstand: #selector
Receiver: nil
Arguments and temporary variables:
aMessage: selector
exception: MessageNotUnderstood: UndefinedObject>>selector
resumeValue: nil
Receiver's instance variables:
nil
PSMCMergePatchMorph>>selectNextConflict
Receiver: a PSMCMergePatchMorph(2798)
Arguments and temporary variables:
next: a MCConflict
Receiver's instance variables:
bounds: 3...@77 corner: 1...@564
owner: a PSMCMergeMorph(3639)
submorphs: an Array(a ProportionalSplitterMorph(3787) a
MergeDiffMorph(3261) a ...etc...
fullBounds: 3...@77 corner: 1...@564
color: Color transparent
extension: a MorphExtension (1779) [other: (myDependents
-> a
DependentsArray(...etc...
borderWidth: 0
borderColor: #inset
model: an OrderedCollection(a MCModification a MCModification a
MCAddition a MC...etc...
slotName: nil
open: false
diffMorph: a MergeDiffMorph(3261)
changeTree: a TreeListMorph(2496)
selectedChangeWrapper: a PSMCConflictWrapper
PSMCMergeMorph>>selectNextConflict
Receiver: a PSMCMergeMorph(3639)
Arguments and temporary variables:
Receiver's instance variables:
bounds: 3...@77 corner: 1...@889
owner: a StandardWindow(1034)
submorphs: an Array(a ProportionalSplitterMorph(2834) a
PanelMorph(1565) a Plug...etc...
fullBounds: 3...@77 corner: 1...@889
color: Color white
extension: a MorphExtension (2299) [locked] [other:
(myDependents
-> a Depend...etc...
borderWidth: 0
borderColor: (Color r: 0.667 g: 0.667 b: 0.667)
model: a MCThreeWayMerger
slotName: nil
open: false
patchMorph: a PSMCMergePatchMorph(2798)
codeMorph: a PluggableTextEditorMorph(3583)
merged: false
PluggableButtonMorphPlus(PluggableButtonMorph)>>performAction
Receiver: a PluggableButtonMorphPlus(3905)
Arguments and temporary variables:
Receiver's instance variables:
bounds: 4...@861 corner: 1...@885
owner: a PanelMorph(1565)
submorphs: an Array(an AlignmentMorph(1769))
fullBounds: 4...@861 corner: 1...@885
color: (Color r: 0.827 g: 0.827 b: 0.827)
extension: a MorphExtension (1467) [balloonText] [other:
(layoutPolicy -> a T...etc...
borderWidth: 0
borderColor: Color transparent
model: a PSMCMergeMorph(3639)
label: '5 conflicts'
getStateSelector: nil
actionSelector: #selectNextConflict
getLabelSelector: #conflictCountString
getMenuSelector: nil
shortcutCharacter: nil
askBeforeChanging: false
triggerOnMouseDown: false
offColor: nil
onColor: nil
feedbackColor: nil
showSelectionFeedback: false
allButtons: nil
arguments: #()
argumentsProvider: nil
argumentsSelector: nil
enabled: true
action: nil
getColorSelector: nil
getEnabledSelector: #notAllConflictsResolved
--- The full stack ---
UndefinedObject(Object)>>doesNotUnderstand: #selector
PSMCMergePatchMorph>>selectNextConflict
PSMCMergeMorph>>selectNextConflict
PluggableButtonMorphPlus(PluggableButtonMorph)>>performAction
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PluggableButtonMorphPlus>>performAction
[] in PluggableButtonMorphPlus(PluggableButtonMorph)>>mouseUp: {[:m | (m
containsPoint: evt cursorPoint) ifTrue: [m performAction]]}
Array(SequenceableCollection)>>do:
PluggableButtonMorphPlus(PluggableButtonMorph)>>mouseUp:
PluggableButtonMorphPlus>>mouseUp:
PluggableButtonMorphPlus(Morph)>>handleMouseUp:
MouseButtonEvent>>sentTo:
PluggableButtonMorphPlus(Morph)>>handleEvent:
PluggableButtonMorphPlus(Morph)>>handleFocusEvent:
[] in HandMorph>>sendFocusEvent:to:clear: {[ActiveHand := self.
ActiveEvent := anEvent. result := focusHolder han...]}
[] in PasteUpMorph>>becomeActiveDuring: {[aBlock value]}
BlockContext>>on:do:
PasteUpMorph>>becomeActiveDuring:
HandMorph>>sendFocusEvent:to:clear:
HandMorph>>sendEvent:focus:clear:
HandMorph>>sendMouseEvent:
HandMorph>>handleEvent:
HandMorph>>processEvents
[] in WorldState>>doOneCycleNowFor: {[:h | ActiveHand := h. h
processEvents. ActiveHand := nil]}
...etc...
_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
