[squeak-dev] The Trunk: MonticelloConfigurations-cmm.106.mcz

commits at source.squeak.org commits at source.squeak.org
Fri Aug 3 21:15:09 UTC 2012


Chris Muller uploaded a new version of MonticelloConfigurations to project The Trunk:
http://source.squeak.org/trunk/MonticelloConfigurations-cmm.106.mcz

==================== Summary ====================

Name: MonticelloConfigurations-cmm.106
Author: cmm
Time: 3 August 2012, 4:14:52.814 pm
UUID: 72e1b1a7-37c9-4588-89b5-6bbf3391edd3
Ancestors: MonticelloConfigurations-bf.105

- Reassign MCConfiguration>>#mustMerge: to MCVersion as #shouldMerge.  I need it outside the context of a MCConfiguration.

=============== Diff against MonticelloConfigurations-bf.105 ===============

Item was changed:
  ----- Method: MCConfiguration>>upgrade (in category 'actions') -----
  upgrade
  	^self depsSatisfying: [:dep | dep isFulfilledByAncestors not]
  		versionDo: [:ver | 
+ 			(Preferences upgradeIsMerge and: [ver shouldMerge])
- 			(Preferences upgradeIsMerge and: [self mustMerge: ver])
  				ifFalse: [ver load]
  				ifTrue: [[ver merge]
  					on: MCMergeResolutionRequest do: [:request |
  						request merger conflicts isEmpty
  							ifTrue: [request resume: true]
  							ifFalse: [request pass]]]]
  		displayingProgress: 'upgrading packages'
  !



More information about the Squeak-dev mailing list