Issue #531: proposed fix

.travis.yml

@@ -11,7 +11,7 @@ smalltalk:
   - GemStone-3.2.17
   - GemStone-3.3.9
   - GemStone-3.4.5
-  - GemStone-3.5.2
+  - GemStone-3.5.4
   - Pharo-3.0
   - Pharo-4.0
   - Pharo-6.0

repository/Metacello-Core.package/MetacelloSpec.class/instance/validateMergeWithBaselineOfSpec..st

@@ -0,0 +1,3 @@
+merging
+validateMergeWithBaselineOfSpec: aSpec
+  ^ aSpec class = self class

repository/Metacello-Core.package/monticello.meta/version

@@ -1,3 +1 @@
-(name 'Metacello-Core-EstebanLorenzano.832' message 'fix sorting' id 'f4dc80cf-ed16-0d00-b586-615c02a3b4b1' date '2 October 2017' time '10:22:21.631467 am' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.1506604027' message 'fix sort' id '205233c7-ed16-0d00-b585-160f02a3b4b1' date '2 October 2017' time '10:20:02.328345 am' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.1506604026' message 'try Smalltalk globals
-' id 'e9ef7842-178d-5129-b48c-41e6f51ca224' date '28 September 2017' time '3:07:06 pm' author 'EstebanLorenzano' ancestors () stepChildren ())) stepChildren ())(name 'Metacello-Core-EstebanLorenzano.831' message 'fix Pharo incompatibilities' id '99742f44-8f16-0d00-9b37-b97c0b3a6d5c' date '27 September 2017' time '5:34:37.334746 pm' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.1505888671' message 'do not allow Pharo 6.0 to fail
-' id '33178a16-f403-5200-9e37-18798c0b8563' date '20 September 2017' time '8:24:31 am' author 'EstebanLorenzano' ancestors () stepChildren ())(name 'Metacello-Core-EstebanLorenzano.831' message 'using #ifNotNil:ifNil:' id 'f5807262-e915-0d00-8037-597405e48e14' date '19 September 2017' time '11:40:20.473617 am' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.830' message 'add support for tonel file format.fixes for Pharo 6.0+ (now tests should be passing).' id '06cec3ba-b015-0d00-8898-c7080ff3e6a9' date '16 September 2017' time '4:04:49.060828 pm' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.829' message 'add support for tonel file format.fixes for Pharo 6.0+ (now tests should be passing).' id '7c061b45-b015-0d00-887e-ca1d0ff3e6a9' date '16 September 2017' time '3:31:55.065402 pm' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.1505561321' message 'add tonel compatibility' id '8fb2afd4-2425-5270-9a4d-e394580386f3' date '16 September 2017' time '1:28:41 pm' author 'EstebanLorenzano' ancestors () stepChildren ())) stepChildren ())(name 'Metacello-Core-TravisCI.829' message 'Issue #406: proposed fix' id '49c2afba-f4a7-4dfc-a649-2d020c1608b7' date '28 July 2016' time '4:20:55.155485 pm' author 'TravisCI' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'Metacello-Core-EstebanLorenzano.833' message 'fix for issue #531' id 'f28c4aa2-0eaf-444f-a171-8d3ba701a6c8' date '10/09/2020' time '11:40:25' author 'dkh' ancestors ((name 'Metacello-Core-EstebanLorenzano.832' message 'fix sorting' id 'f4dc80cf-ed16-0d00-b586-615c02a3b4b1' date '10/02/2017' time '10:22:21' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.1506604027' message 'fix sort' id '205233c7-ed16-0d00-b585-160f02a3b4b1' date '10/02/2017' time '10:20:02' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.1506604026' message 'try Smalltalk globals' id 'e9ef7842-178d-5129-b48c-41e6f51ca224' date '09/28/2017' time '15:07:06' author 'EstebanLorenzano' ancestors () stepChildren ())) stepChildren ())(name 'Metacello-Core-EstebanLorenzano.831' message 'fix Pharo incompatibilities' id '99742f44-8f16-0d00-9b37-b97c0b3a6d5c' date '09/27/2017' time '05:34:37' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.1505888671' message 'do not allow Pharo 6.0 to fail' id '33178a16-f403-5200-9e37-18798c0b8563' date '09/20/2017' time '08:24:31' author 'EstebanLorenzano' ancestors () stepChildren ())(name 'Metacello-Core-EstebanLorenzano.831' message 'using #ifNotNil:ifNil:' id 'f5807262-e915-0d00-8037-597405e48e14' date '09/19/2017' time '11:40:20' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.830' message 'add support for tonel file format.fixes for Pharo 6.0+ (now tests should be passing).' id '06cec3ba-b015-0d00-8898-c7080ff3e6a9' date '09/16/2017' time '04:04:49' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.829' message 'add support for tonel file format.fixes for Pharo 6.0+ (now tests should be passing).' id '7c061b45-b015-0d00-887e-ca1d0ff3e6a9' date '09/16/2017' time '03:31:55' author 'EstebanLorenzano' ancestors ((name 'Metacello-Core-EstebanLorenzano.1505561321' message 'add tonel compatibility' id '8fb2afd4-2425-5270-9a4d-e394580386f3' date '09/16/2017' time '13:28:41' author 'EstebanLorenzano' ancestors () stepChildren ())) stepChildren ())(name 'Metacello-Core-TravisCI.829' message 'Issue #406: proposed fix' id '49c2afba-f4a7-4dfc-a649-2d020c1608b7' date '07/28/2016' time '04:20:55' author 'TravisCI' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

repository/Metacello-MC.package/MetacelloMCBaselineOfProjectSpec.class/instance/validateMergeForSpec..st

@@ -0,0 +1,10 @@
+merging
+validateMergeForSpec: aSpec
+  (aSpec validateMergeWithBaselineOfSpec: self)
+    ifFalse: [ 
+      self
+        error:
+          'The project spec ' , self name printString , ' in project '
+            , self project label , ' has incompatible specs. '
+            , aSpec class name asString , ' and ' , self class name asString
+            , ' are not compatible.' ]

repository/Metacello-MC.package/MetacelloMCBaselineOfProjectSpec.class/instance/validateMergeWithBaselineOfSpec..st

@@ -0,0 +1,3 @@
+merging
+validateMergeWithBaselineOfSpec: aSpec
+  ^ true