|
45
|
1 |
"{ Package: 'stx:goodies/monticello' }"
|
|
|
2 |
|
|
|
3 |
Object subclass:#MCMerger
|
|
|
4 |
instanceVariableNames:'conflicts'
|
|
|
5 |
classVariableNames:''
|
|
|
6 |
poolDictionaries:''
|
|
641
|
7 |
category:'SCM-Monticello-Merging'
|
|
45
|
8 |
!
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
!MCMerger methodsFor:'as yet unclassified'!
|
|
|
12 |
|
|
|
13 |
addConflictWithOperation: anOperation
|
|
|
14 |
self conflicts add: (MCConflict operation: anOperation)
|
|
|
15 |
!
|
|
|
16 |
|
|
|
17 |
applyTo: anObject
|
|
|
18 |
self isMerged ifFalse: [self error: 'You must resolve all the conflicts first'].
|
|
|
19 |
conflicts do: [:ea | ea applyTo: anObject]
|
|
|
20 |
!
|
|
|
21 |
|
|
|
22 |
conflicts
|
|
224
|
23 |
^ conflicts ifNil: [conflicts := OrderedCollection new]
|
|
45
|
24 |
!
|
|
|
25 |
|
|
|
26 |
isMerged
|
|
|
27 |
^ self conflicts allSatisfy: [:ea | ea isResolved]
|
|
|
28 |
!
|
|
|
29 |
|
|
|
30 |
load
|
|
|
31 |
| loader |
|
|
224
|
32 |
loader := MCPackageLoader new.
|
|
45
|
33 |
loader provisions addAll: self provisions.
|
|
|
34 |
self applyTo: loader.
|
|
|
35 |
loader load
|
|
|
36 |
!
|
|
|
37 |
|
|
|
38 |
loadWithNameLike: baseName
|
|
|
39 |
| loader |
|
|
224
|
40 |
loader := MCPackageLoader new.
|
|
45
|
41 |
loader provisions addAll: self provisions.
|
|
|
42 |
self applyTo: loader.
|
|
|
43 |
loader loadWithNameLike: baseName
|
|
|
44 |
!
|
|
|
45 |
|
|
|
46 |
mergedSnapshot
|
|
|
47 |
^ MCPatcher apply: self to: self baseSnapshot
|
|
|
48 |
!
|
|
|
49 |
|
|
|
50 |
operations
|
|
|
51 |
^ #()
|
|
|
52 |
!
|
|
|
53 |
|
|
|
54 |
provisions
|
|
|
55 |
^ #()
|
|
|
56 |
! !
|
|
|
57 |
|
|
|
58 |
!MCMerger class methodsFor:'documentation'!
|
|
|
59 |
|
|
|
60 |
version
|
|
641
|
61 |
^ '$Header: /cvs/stx/stx/goodies/monticello/MCMerger.st,v 1.4 2012-09-11 21:23:15 cg Exp $'
|
|
224
|
62 |
!
|
|
|
63 |
|
|
|
64 |
version_CVS
|
|
641
|
65 |
^ '$Header: /cvs/stx/stx/goodies/monticello/MCMerger.st,v 1.4 2012-09-11 21:23:15 cg Exp $'
|
|
224
|
66 |
!
|
|
|
67 |
|
|
|
68 |
version_SVN
|
|
|
69 |
^ '§Id: MCMerger.st 5 2010-08-29 07:30:29Z vranyj1 §'
|
|
45
|
70 |
! !
|