Marcel Taeumel uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-mt.643.mcz
==================== Summary ====================
Name: Monticello-mt.643 Author: mt Time: 3 August 2016, 5:12:29.133179 pm UUID: 75d22f47-6cf5-5d44-9416-dd46377863ec Ancestors: Monticello-mt.642
Fixes the merge button in MC's merge browser.
=============== Diff against Monticello-mt.642 ===============
Item was changed: ----- Method: MCMergeBrowser>>chooseAllNewerConflicts (in category 'as yet unclassified') ----- chooseAllNewerConflicts conflicts do: [ :ea | ea chooseNewer ]. + self changed: #text; changed: #list; changed: #canMerge.! - self changed: #text; changed: #list.!
Item was changed: ----- Method: MCMergeBrowser>>chooseAllOlderConflicts (in category 'as yet unclassified') ----- chooseAllOlderConflicts conflicts do: [ :ea | ea chooseOlder ]. + self changed: #text; changed: #list; changed: #canMerge.! - self changed: #text; changed: #list.!
Item was changed: ----- Method: MCMergeBrowser>>chooseAllSameAST (in category 'as yet unclassified') ----- chooseAllSameAST conflicts do: [ :ea | ea chooseSameAST ]. + self changed: #text; changed: #list; changed: #canMerge.! - self changed: #text; changed: #list.!
Item was changed: ----- Method: MCMergeBrowser>>chooseAllUnchosenLocal (in category 'as yet unclassified') ----- chooseAllUnchosenLocal conflicts do: [ :ea | ea isResolved ifFalse: [ ea chooseLocal ] ]. + self changed: #text; changed: #list; changed: #canMerge.! - self changed: #text; changed: #list.!
Item was changed: ----- Method: MCMergeBrowser>>chooseAllUnchosenRemote (in category 'as yet unclassified') ----- chooseAllUnchosenRemote conflicts do: [ :ea | ea isResolved ifFalse: [ ea chooseRemote ] ]. + self changed: #text; changed: #list; changed: #canMerge.! - self changed: #text; changed: #list.!
Item was changed: ----- Method: MCMergeBrowser>>chooseLocal (in category 'as yet unclassified') ----- chooseLocal self conflictSelectionDo: [selection chooseLocal. + self changed: #text; changed: #list; changed: #canMerge]. - self changed: #text; changed: #list]. self selectNextUnresolvedConflict!
Item was changed: ----- Method: MCMergeBrowser>>chooseRemote (in category 'as yet unclassified') ----- chooseRemote self conflictSelectionDo: [selection chooseRemote. + self changed: #text; changed: #list; changed: #canMerge]. - self changed: #text; changed: #list]. self selectNextUnresolvedConflict!
Item was changed: ----- Method: MCMergeBrowser>>clearChoice (in category 'as yet unclassified') ----- clearChoice self conflictSelectionDo: [selection clearChoice. + self changed: #text; changed: #list; changed: #canMerge]! - self changed: #text; changed: #list]!
squeak-dev@lists.squeakfoundation.org