RV: [V3dot10] Do in a workspace and say if could build

[Edgar J. De Cleene]

El 6/19/07 7:23 AM, "Bert Freudenberg" <bert at freudenbergs.de> escribió:

> Simplest is to delete the wrong 23, 25 and 27 in the repo
But I can't delete wrong files...

If some could, I very happy.

Is so sad for me having all wondering. And have snow ball grow and grow.
Really thanks you.

> I made these by first backporting edc.23 to md.22 (but removing any
> trace of doing so) and saving as bf.23, and then merging edc.25
> (again removing that info) before saving as bf.24. This is to get a
> "clean" history for the release image, it should have worked fine
> without that ancestor trickery, but the bad ancestry contained refs
> to the missing versions.

Send me details, I need learn this

Just I made another change, seems work no matter the files are wrong.

My experiments with the pre310 repository (I could put and delete files
here) show some new problems, as Damien found and I confirm.

This new "horrible" patch seems found the versions and work.

Again, very very thanks.

Edgar

-------------- next part --------------
'From Squeak3.10alpha of 30 March 2007 [latest update: #7105] on 19 June 2007 at 7:29:08 am'!

!ReleaseBuilderFor3dot10 methodsFor: 'managing updates' stamp: 'edc 6/19/2007 07:29'!
loadTogether: aCollection merge: aBoolean
	| loader newVersion onlyNew oldVersion |
	loader := aBoolean
		ifTrue: [ MCVersionMerger new ]
		ifFalse: [ MCVersionLoader new].
	aCollection do: [:eachVersion | self addRepositoryToPackageNamed: (eachVersion copyUpTo: $- )].
	(self newerVersionsIn: aCollection)
		do: [:fn | newVersion := (self repository loadVersionFromFileNamed: fn) .newVersion ifNil: [ onlyNew := fn copyUpTo: $(.
				onlyNew := onlyNew , '.mcz'.
				newVersion := (self repository loadVersionFromFileNamed: onlyNew).
				
				oldVersion := newVersion workingCopy ancestors first name.
				oldVersion := oldVersion , '.mcz'.
				oldVersion := (self repository loadVersionFromFileNamed: oldVersion ).
				loader addVersion: oldVersion
				 ].
			
			.loader addVersion: newVersion.
			]
  	  	displayingProgress: 'Adding versions...'.
	aBoolean
		ifTrue: [[loader merge] on: MCMergeResolutionRequest do: [:request |
					request merger conflicts isEmpty
						ifTrue: [request resume: true]
						ifFalse: [request pass]]]
		ifFalse: [loader load]

! !