--- a/ChangeSetDiffEntry.st Tue Apr 03 18:14:36 2012 +0100
+++ b/ChangeSetDiffEntry.st Mon Apr 09 19:33:20 2012 +0100
@@ -322,21 +322,18 @@
automerge
- "Try to automatically merge differences. The merge is based
- on versionBase. If any of versions is same as versionBase,
- the other is used as merge result"
-
-
"Automerge version methods"
versionB ifNil:[^self].
versionB isMethodCodeChange ifTrue:[
(AbstractSourceCodeManager isVersionMethodSelector: versionB selector) ifTrue:[
versionMerged := versionB copy.
+ self mergeInfo mergeUsingB: (versionB source)
]
].
"Created: / 02-11-2009 / 18:51:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (comment): / 20-03-2012 / 22:15:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 09-04-2012 / 16:37:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (comment): / 09-04-2012 / 18:01:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetDiffEntry methodsFor:'testing'!
@@ -366,5 +363,5 @@
!
version_SVN
- ^ '$Id: ChangeSetDiffEntry.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffEntry.st 1913 2012-04-09 18:33:20Z vranyj1 $'
! !