The Trunk: Installer-Core-cmm.384.mcz

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

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

Name: Installer-Core-cmm.384
Author: cmm
Time: 11 November 2013, 9:30:54.959 pm
UUID: 3405b56f-b67b-46cc-bdd4-9b50a924bfda
Ancestors: Installer-Core-cmm.383

- When using Installer's new merge function, add the repository the package was loaded from to that packages repositories (its repositoryGroup).

=============== Diff against Installer-Core-cmm.383 ===============

Item was changed:
  ----- Method: Installer>>primMerge: (in category 'private') -----
  primMerge: packageName
  [ | version |
  version := (currentRepository includesVersionNamed: packageName)
  ifTrue: [ currentRepository versionNamed: packageName ]
  ifFalse: [ currentRepository highestNumberedVersionForPackageNamed: packageName ].
  version shouldMerge
  ifTrue: [ version merge ]
+ ifFalse: [ version load ].
+ version workingCopy repositoryGroup addRepository: currentRepository ]
- ifFalse: [ version load ] ]
  on: MCNoChangesException
+ do:
+ [ : req | req resume ]
- do: [ : req | req resume ]
  on: MCMergeResolutionRequest
  do:
  [ : request | request merger conflicts isEmpty
  ifTrue: [ request resume: true ]
  ifFalse: [ request pass ] ]!