--- a/ChangeSetDiffComponent.st	Tue Jul 31 14:34:33 2012 +0200
+++ b/ChangeSetDiffComponent.st	Tue Jul 31 14:34:40 2012 +0200
@@ -65,6 +65,12 @@
 "
 ! !
 
+!ChangeSetDiffComponent class methodsFor:'others'!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.4 2012-07-31 12:34:40 vrany Exp $'
+! !
+
 !ChangeSetDiffComponent methodsFor:'accessing'!
 
 changesetA
@@ -73,24 +79,58 @@
 
     cs := ChangeSet new name: self versionALabel.
     self do:[:item|
-        cs add: item versionA
+        (item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]) ifTrue:[
+            cs add: item versionA
+        ]
     ].
     ^cs
 
-    "Modified: / 16-12-2011 / 14:35:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-03-2012 / 13:57:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changesetB
-    "Answers a changeset with containing all versionB changes"
+    "Answers a changeset with containing all versionA changes"
     | cs |
 
     cs := ChangeSet new name: self versionBLabel.
     self do:[:item|
-        cs add: item versionB
+        (item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]) ifTrue:[
+            cs add: item versionB
+        ]
     ].
     ^cs
 
-    "Modified: / 16-12-2011 / 14:35:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-03-2012 / 13:57:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+changesetBase
+    "Answers a changeset with containing all versionA changes"
+    | cs |
+
+    cs := ChangeSet new name: self versionBaseLabel.
+    self do:[:item|
+        (item versionBase isClassDefinitionChange or:[item versionBase isMethodCodeChange]) ifTrue:[
+            cs add: item versionBase
+        ]
+    ].
+    ^cs
+
+    "Created: / 20-03-2012 / 13:31:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+changesetMerged
+    "Answers a changeset with containing all versionA changes"
+    | cs |
+
+    cs := ChangeSet new name: 'Merged'.
+    self do:[:item|
+"/        (item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]) ifTrue:[
+            cs add: item versionMerged
+"/        ]
+    ].
+    ^cs
+
+    "Created: / 20-03-2012 / 13:32:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 diffs
@@ -107,12 +147,6 @@
     "Created: / 05-12-2009 / 11:07:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-merged
-    "raise an error: must be redefined in concrete subclass(es)"
-
-    ^ self subclassResponsibility
-!
-
 name
     "raise an error: must be redefined in concrete subclass(es)"
 
@@ -137,6 +171,12 @@
     ^ parent versionBLabel
 
     "Created: / 09-11-2009 / 12:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+versionBaseLabel
+    ^ parent versionBaseLabel
+
+    "Created: / 20-03-2012 / 13:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetDiffComponent methodsFor:'change & update'!
@@ -194,10 +234,23 @@
 isEmpty
 
     ^false
+!
+
+isForVersionMethod
+    "Returns true, if this is an entry for version method"
+    ^self subclassResponsibility
+
+    "Created: / 18-04-2012 / 19:04:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isMerged
+    "raise an error: must be redefined in concrete subclass(es)"
+
+    ^ self subclassResponsibility
 ! !
 
 !ChangeSetDiffComponent class methodsFor:'documentation'!
 
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.3 2011-12-19 08:37:48 vrany Exp $'
+version_SVN
+    ^ '§Id: ChangeSetDiffComponent.st 1920 2012-04-18 20:21:56Z vranyj1 §'
 ! !