equal
deleted
inserted
replaced
320 |
320 |
321 !ChangeSetDiffEntry methodsFor:'merging'! |
321 !ChangeSetDiffEntry methodsFor:'merging'! |
322 |
322 |
323 automerge |
323 automerge |
324 |
324 |
325 "Try to automatically merge differences. The merge is based |
|
326 on versionBase. If any of versions is same as versionBase, |
|
327 the other is used as merge result" |
|
328 |
|
329 |
|
330 "Automerge version methods" |
325 "Automerge version methods" |
331 versionB ifNil:[^self]. |
326 versionB ifNil:[^self]. |
332 versionB isMethodCodeChange ifTrue:[ |
327 versionB isMethodCodeChange ifTrue:[ |
333 (AbstractSourceCodeManager isVersionMethodSelector: versionB selector) ifTrue:[ |
328 (AbstractSourceCodeManager isVersionMethodSelector: versionB selector) ifTrue:[ |
334 versionMerged := versionB copy. |
329 versionMerged := versionB copy. |
|
330 self mergeInfo mergeUsingB: (versionB source) |
335 ] |
331 ] |
336 ]. |
332 ]. |
337 |
333 |
338 "Created: / 02-11-2009 / 18:51:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
334 "Created: / 02-11-2009 / 18:51:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
339 "Modified (comment): / 20-03-2012 / 22:15:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
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>" |
340 ! ! |
337 ! ! |
341 |
338 |
342 !ChangeSetDiffEntry methodsFor:'testing'! |
339 !ChangeSetDiffEntry methodsFor:'testing'! |
343 |
340 |
344 isDiffItem |
341 isDiffItem |
364 version_CVS |
361 version_CVS |
365 ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSetDiffEntry.st,v 1.3 2011/11/30 18:52:51 vrany Exp §' |
362 ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSetDiffEntry.st,v 1.3 2011/11/30 18:52:51 vrany Exp §' |
366 ! |
363 ! |
367 |
364 |
368 version_SVN |
365 version_SVN |
369 ^ '$Id: ChangeSetDiffEntry.st 1909 2012-03-31 00:14:49Z vranyj1 $' |
366 ^ '$Id: ChangeSetDiffEntry.st 1913 2012-04-09 18:33:20Z vranyj1 $' |
370 ! ! |
367 ! ! |