--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MCVersionMerger.st	Wed Nov 22 14:16:23 2006 +0100
@@ -0,0 +1,65 @@
+"{ Package: 'stx:goodies/monticello' }"
+
+Object subclass:#MCVersionMerger
+	instanceVariableNames:'records merger'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Monticello-Versioning'
+!
+
+
+!MCVersionMerger class methodsFor:'as yet unclassified'!
+
+mergeVersion: aVersion
+	self new
+		addVersion: aVersion;
+		mergeWithNameLike: aVersion info name
+!
+
+new
+	^ self basicNew initialize
+! !
+
+!MCVersionMerger methodsFor:'as yet unclassified'!
+
+addVersion: aVersion
+	| dep |
+	records add: (MCMergeRecord version: aVersion).
+	aVersion dependencies do:
+		[:ea |
+		dep _ ea resolve.
+		(records anySatisfy: [:r | r version = dep]) ifFalse: [self addVersion: dep]]
+!
+
+initialize
+	records _ OrderedCollection new.
+	merger _ MCThreeWayMerger new.
+!
+
+merge
+	records do: [:ea | merger addBaseSnapshot: ea packageSnapshot].
+	records do: [:ea | merger applyPatch: ea mergePatch].
+	self resolveConflicts ifTrue:
+		[merger load.
+		records do: [:ea | ea updateWorkingCopy]].
+!
+
+mergeWithNameLike: baseName
+	records do: [:ea | merger addBaseSnapshot: ea packageSnapshot].
+	records do: [:ea | merger applyPatch: ea mergePatch].
+	self resolveConflicts ifTrue:
+		[merger loadWithNameLike: baseName.
+		records do: [:ea | ea updateWorkingCopy]].
+!
+
+resolveConflicts
+	(records allSatisfy: [:ea | ea isAncestorMerge]) ifTrue: [MCNoChangesException signal. ^ false].
+	^ ((MCMergeResolutionRequest new merger: merger)
+		signal: 'Merging ', records first version info name) = true
+! !
+
+!MCVersionMerger class methodsFor:'documentation'!
+
+version
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCVersionMerger.st,v 1.1 2006-11-22 13:16:23 cg Exp $'
+! !