author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 18 Apr 2012 21:21:56 +0100 | |
branch | jv |
changeset 3051 | e056039b3a1b |
parent 3045 | 0d05c8eaa028 |
child 3056 | 251db3a15e2e |
permissions | -rw-r--r-- |
2409 | 1 |
" |
2 |
Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, |
|
3 |
Czech Technical University in Prague |
|
4 |
Copyright (c) 2009-2010 eXept Software AG |
|
5 |
||
6 |
Permission is hereby granted, free of charge, to any person |
|
7 |
obtaining a copy of this software and associated documentation |
|
8 |
files (the 'Software'), to deal in the Software without |
|
9 |
restriction, including without limitation the rights to use, |
|
10 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
11 |
copies of the Software, and to permit persons to whom the |
|
12 |
Software is furnished to do so, subject to the following |
|
13 |
conditions: |
|
14 |
||
15 |
The above copyright notice and this permission notice shall be |
|
16 |
included in all copies or substantial portions of the Software. |
|
17 |
||
18 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
19 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
20 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
21 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
22 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
23 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
24 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
25 |
OTHER DEALINGS IN THE SOFTWARE. |
|
26 |
" |
|
27 |
"{ Package: 'stx:libbasic3' }" |
|
28 |
||
29 |
ChangeSetDiffComponent subclass:#ChangeSetDiffEntry |
|
3030 | 30 |
instanceVariableNames:'versionBase versionA versionB versionMerged mergeInfo' |
2409 | 31 |
classVariableNames:'' |
32 |
poolDictionaries:'' |
|
33 |
category:'System-Changes-Diff' |
|
34 |
! |
|
35 |
||
36 |
!ChangeSetDiffEntry class methodsFor:'documentation'! |
|
37 |
||
38 |
copyright |
|
39 |
" |
|
40 |
Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, |
|
41 |
Czech Technical University in Prague |
|
42 |
Copyright (c) 2009-2010 eXept Software AG |
|
43 |
||
44 |
Permission is hereby granted, free of charge, to any person |
|
45 |
obtaining a copy of this software and associated documentation |
|
46 |
files (the 'Software'), to deal in the Software without |
|
47 |
restriction, including without limitation the rights to use, |
|
48 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
49 |
copies of the Software, and to permit persons to whom the |
|
50 |
Software is furnished to do so, subject to the following |
|
51 |
conditions: |
|
52 |
||
53 |
The above copyright notice and this permission notice shall be |
|
54 |
included in all copies or substantial portions of the Software. |
|
55 |
||
56 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
57 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
58 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
59 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
60 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
61 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
62 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
63 |
OTHER DEALINGS IN THE SOFTWARE. |
|
64 |
||
65 |
" |
|
66 |
! ! |
|
67 |
||
68 |
!ChangeSetDiffEntry class methodsFor:'instance creation'! |
|
69 |
||
70 |
versionA:versionA |
|
71 |
||
72 |
^self new |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
73 |
"/ versionB: versionA asAntiChange |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
74 |
versionA: versionA. |
2409 | 75 |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
76 |
"Modified (comment): / 20-03-2012 / 21:42:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2409 | 77 |
! |
78 |
||
79 |
versionA:versionA versionB:versionB |
|
80 |
||
81 |
^self new |
|
82 |
versionA: versionA; |
|
83 |
versionB: versionB. |
|
84 |
! |
|
85 |
||
86 |
versionB:versionB |
|
87 |
||
88 |
^self new |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
89 |
"/ versionA: versionB asAntiChange; |
2409 | 90 |
versionB: versionB. |
91 |
||
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
92 |
"Modified: / 20-03-2012 / 21:42:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2409 | 93 |
! ! |
94 |
||
95 |
!ChangeSetDiffEntry class methodsFor:'image specs'! |
|
96 |
||
97 |
iconMinus |
|
2492 | 98 |
^ ToolbarIconLibrary iconMinus12x12 |
2409 | 99 |
|
2492 | 100 |
"Modified: / 31-08-2011 / 10:51:21 / cg" |
2409 | 101 |
! |
102 |
||
103 |
iconPlus |
|
2492 | 104 |
^ ToolbarIconLibrary iconPlus12x12 |
2409 | 105 |
|
2492 | 106 |
"Modified: / 31-08-2011 / 10:51:34 / cg" |
2409 | 107 |
! ! |
108 |
||
109 |
!ChangeSetDiffEntry methodsFor:'accessing'! |
|
110 |
||
2631 | 111 |
changeClass |
112 |
||
113 |
^(versionA ? versionB) changeClass |
|
114 |
||
115 |
"Created: / 30-11-2011 / 11:35:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
116 |
! |
|
117 |
||
118 |
changeSelector |
|
119 |
||
120 |
| chg | |
|
121 |
||
122 |
(chg := versionA ? versionB) isMethodChange ifTrue:[ |
|
123 |
^chg changeSelector |
|
124 |
] ifFalse:[ |
|
125 |
^nil |
|
126 |
] |
|
127 |
||
128 |
"Created: / 30-11-2011 / 11:40:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
129 |
! |
|
130 |
||
2409 | 131 |
className |
132 |
||
133 |
^(versionA ? versionB) className |
|
134 |
||
135 |
"Created: / 01-11-2009 / 16:48:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
136 |
! |
|
137 |
||
3030 | 138 |
mergeInfo |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
139 |
(mergeInfo isNil and:[Tools::TextMergeInfo notNil]) ifTrue:[ |
3030 | 140 |
mergeInfo := Tools::TextMergeInfo new. |
141 |
mergeInfo text1: self versionBaseText text2: self versionAText text3: self versionBText. |
|
142 |
]. |
|
143 |
^mergeInfo |
|
144 |
||
145 |
"Created: / 19-03-2012 / 14:57:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
146 |
! |
|
147 |
||
148 |
mergeInfo:aTextMergeInfo |
|
149 |
mergeInfo := aTextMergeInfo. |
|
150 |
||
151 |
"Created: / 19-03-2012 / 14:57:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
152 |
! |
|
153 |
||
2409 | 154 |
mergedUsingVersionA |
155 |
||
156 |
versionMerged ifNil:[^false]. |
|
157 |
versionA ifNil:[^false]. |
|
158 |
||
159 |
^versionA sameAs: versionMerged |
|
160 |
||
161 |
"Created: / 24-11-2009 / 08:16:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
162 |
! |
|
163 |
||
164 |
mergedUsingVersionB |
|
165 |
||
166 |
versionMerged ifNil:[^false]. |
|
167 |
versionB ifNil:[^false]. |
|
168 |
||
169 |
^versionB sameAs: versionMerged |
|
170 |
||
171 |
"Created: / 24-11-2009 / 08:16:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
172 |
! |
|
173 |
||
174 |
mergedUsingVersionBase |
|
175 |
||
176 |
versionMerged ifNil:[^false]. |
|
177 |
versionBase ifNil:[^false]. |
|
178 |
||
179 |
^versionBase sameAs: versionMerged |
|
180 |
||
181 |
"Created: / 24-11-2009 / 08:16:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
182 |
! |
|
183 |
||
184 |
name |
|
185 |
||
186 |
^self versionAorB displayString |
|
187 |
||
188 |
"Created: / 24-11-2009 / 09:56:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
189 |
! |
|
190 |
||
191 |
nonMetaClassName |
|
192 |
||
193 |
^(versionA ? versionB) nonMetaClassName |
|
194 |
||
195 |
"Created: / 21-11-2009 / 07:42:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
196 |
! |
|
197 |
||
198 |
versionA |
|
199 |
^ versionA |
|
200 |
! |
|
201 |
||
202 |
versionA:something |
|
203 |
versionA := something. |
|
204 |
! |
|
205 |
||
206 |
versionALabel |
|
207 |
^ parent versionALabel |
|
208 |
||
209 |
"Created: / 09-11-2009 / 12:38:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
210 |
! |
|
211 |
||
212 |
versionAText |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
213 |
^versionA notNil ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
214 |
versionA source |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
215 |
] ifFalse:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
216 |
nil |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
217 |
]. |
2409 | 218 |
|
219 |
"Created: / 06-07-2011 / 12:29:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
220 |
! |
|
221 |
||
222 |
versionAorB |
|
223 |
||
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
224 |
^versionA ? versionB |
2409 | 225 |
|
226 |
"Created: / 02-11-2009 / 18:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
227 |
! |
|
228 |
||
229 |
versionB |
|
230 |
^ versionB |
|
231 |
! |
|
232 |
||
233 |
versionB:something |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
234 |
|
2409 | 235 |
versionB := something. |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
236 |
|
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
237 |
"Modified: / 20-03-2012 / 22:08:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2409 | 238 |
! |
239 |
||
240 |
versionBLabel |
|
241 |
^ parent versionBLabel |
|
242 |
||
243 |
"Created: / 09-11-2009 / 12:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
244 |
! |
|
245 |
||
246 |
versionBText |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
247 |
^versionB notNil ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
248 |
versionB source |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
249 |
] ifFalse:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
250 |
nil |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
251 |
]. |
2409 | 252 |
|
253 |
"Created: / 06-07-2011 / 12:29:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
254 |
! |
|
255 |
||
256 |
versionBase |
|
257 |
^ versionBase |
|
258 |
! |
|
259 |
||
260 |
versionBase:something |
|
261 |
versionBase := something. |
|
262 |
! |
|
263 |
||
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
264 |
versionBaseText |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
265 |
^versionBase notNil ifTrue:[ |
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
266 |
versionBase source |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
267 |
] ifFalse:[ |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
268 |
nil |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
269 |
]. |
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
270 |
|
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
271 |
"Created: / 16-03-2012 / 15:20:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
272 |
! |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
273 |
|
2409 | 274 |
versionMerged |
3033 | 275 |
"Returns a change representing a merge" |
276 |
||
277 |
| merged | |
|
278 |
merged := versionMerged. |
|
279 |
(merged isNil and:[mergeInfo notNil]) ifTrue:[ |
|
280 |
merged := (versionA ? versionB ? versionBase) copy. |
|
281 |
merged source: mergeInfo text. |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
282 |
merged isClassDefinitionChange ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
283 |
merged setupFromSource. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
284 |
] |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
285 |
|
3033 | 286 |
]. |
287 |
^merged |
|
288 |
||
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
289 |
"Modified: / 21-03-2012 / 00:59:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2409 | 290 |
! |
291 |
||
292 |
versionMerged:aChange |
|
293 |
versionMerged := aChange. |
|
294 |
self changed:#resolution with: aChange |
|
295 |
||
296 |
"Modified: / 24-11-2009 / 12:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
297 |
! |
|
298 |
||
299 |
versionMergedLabel |
|
300 |
||
301 |
(versionMerged isNil) |
|
302 |
ifTrue:[^'<unresolved>' asText colorizeAllWith: Color red]. |
|
303 |
(versionMerged sameAs: versionA) |
|
304 |
ifTrue:[^self versionALabel]. |
|
305 |
(versionMerged sameAs: versionB) |
|
306 |
ifTrue:[^self versionBLabel]. |
|
307 |
(versionMerged sameAs: versionBase) |
|
308 |
ifTrue:[^self versionBaseLabel]. |
|
309 |
^'manual merge' |
|
310 |
! ! |
|
311 |
||
312 |
!ChangeSetDiffEntry methodsFor:'enumerating'! |
|
313 |
||
314 |
do: aBlock |
|
315 |
||
316 |
aBlock value: self |
|
317 |
||
318 |
"Created: / 25-11-2009 / 10:22:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
319 |
! ! |
|
320 |
||
321 |
!ChangeSetDiffEntry methodsFor:'merging'! |
|
322 |
||
323 |
automerge |
|
324 |
||
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
325 |
"Automerge version methods" |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
326 |
versionB ifNil:[^self]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
327 |
versionB isMethodCodeChange ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
328 |
(AbstractSourceCodeManager isVersionMethodSelector: versionB selector) ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
329 |
versionMerged := versionB copy. |
3045 | 330 |
self mergeInfo mergeUsingB: (versionB source) |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
331 |
] |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
332 |
]. |
2409 | 333 |
|
334 |
"Created: / 02-11-2009 / 18:51:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3045 | 335 |
"Modified: / 09-04-2012 / 16:37:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
336 |
"Modified (comment): / 09-04-2012 / 18:01:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2409 | 337 |
! ! |
338 |
||
339 |
!ChangeSetDiffEntry methodsFor:'testing'! |
|
340 |
||
341 |
isDiffItem |
|
342 |
^ true |
|
3030 | 343 |
! |
344 |
||
3051 | 345 |
isForVersionMethod |
346 |
"Returns true, if this is an entry for version method" |
|
347 |
||
348 |
^versionA notNil and:[versionA isMethodCodeChange |
|
349 |
and:[versionB notNil and:[versionB isMethodCodeChange |
|
350 |
and:[AbstractSourceCodeManager isVersionMethodSelector: versionA selector]]]] |
|
351 |
||
352 |
"Created: / 18-04-2012 / 18:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
353 |
! |
|
354 |
||
3030 | 355 |
isMerged |
356 |
| mi | |
|
357 |
||
3033 | 358 |
versionMerged notNil ifTrue:[ ^ true ]. |
359 |
||
3030 | 360 |
^(mi := self mergeInfo) notNil ifTrue:[ |
361 |
mi isMerged |
|
362 |
] ifFalse:[ |
|
363 |
false |
|
364 |
] |
|
365 |
||
366 |
"Created: / 19-03-2012 / 15:12:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2409 | 367 |
! ! |
368 |
||
369 |
!ChangeSetDiffEntry class methodsFor:'documentation'! |
|
370 |
||
371 |
version_CVS |
|
3011
1997ff6e7e55
trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2631
diff
changeset
|
372 |
^ '§Header: /cvs/stx/stx/libbasic3/ChangeSetDiffEntry.st,v 1.3 2011/11/30 18:52:51 vrany Exp §' |
3012 | 373 |
! |
374 |
||
375 |
version_SVN |
|
3051 | 376 |
^ '$Id: ChangeSetDiffEntry.st 1920 2012-04-18 20:21:56Z vranyj1 $' |
3012 | 377 |
! ! |