[squeak-dev] The Trunk: MonticelloConfigurations-eem.134.mcz

commits at source.squeak.org commits at source.squeak.org
Fri May 15 15:46:35 UTC 2015


Eliot Miranda uploaded a new version of MonticelloConfigurations to project The Trunk:
http://source.squeak.org/trunk/MonticelloConfigurations-eem.134.mcz

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

Name: MonticelloConfigurations-eem.134
Author: eem
Time: 15 May 2015, 8:46:24.696 am
UUID: 55bf6d09-e0ad-4ce2-b861-85e35d611dcb
Ancestors: MonticelloConfigurations-dtl.133

Suppress the annoying "No CHanges" notifiers during
update.

=============== Diff against MonticelloConfigurations-dtl.133 ===============

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