--- a/ChangeSetDiffComponent.st	Wed Feb 05 18:52:13 2014 +0100
+++ b/ChangeSetDiffComponent.st	Wed Feb 05 18:52:14 2014 +0100
@@ -68,7 +68,7 @@
 !ChangeSetDiffComponent class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.4 2012-07-31 12:34:40 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.5 2014-02-05 17:52:14 cg Exp $'
 ! !
 
 !ChangeSetDiffComponent methodsFor:'accessing'!
@@ -79,13 +79,13 @@
 
     cs := ChangeSet new name: self versionALabel.
     self do:[:item|
-        (item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]) ifTrue:[
+        (item versionA notNil" and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
             cs add: item versionA
         ]
     ].
     ^cs
 
-    "Modified: / 20-03-2012 / 13:57:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-12-2013 / 20:55:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changesetB
@@ -94,13 +94,13 @@
 
     cs := ChangeSet new name: self versionBLabel.
     self do:[:item|
-        (item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]) ifTrue:[
+        (item versionB notNil" and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
             cs add: item versionB
         ]
     ].
     ^cs
 
-    "Modified: / 20-03-2012 / 13:57:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-12-2013 / 20:55:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changesetBase
@@ -109,13 +109,14 @@
 
     cs := ChangeSet new name: self versionBaseLabel.
     self do:[:item|
-        (item versionBase isClassDefinitionChange or:[item versionBase isMethodCodeChange]) ifTrue:[
+        (item versionBase notNil" and:[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>"
+    "Modified: / 13-11-2013 / 11:47:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changesetMerged
@@ -124,13 +125,21 @@
 
     cs := ChangeSet new name: 'Merged'.
     self do:[:item|
-"/        (item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]) ifTrue:[
+        (item versionMerged notNil "and:[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>"
+    "Modified: / 13-11-2013 / 11:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+depth
+    "Return the depth if diff component hierarchy, 0 if there is no nesting at all"
+    ^0
+
+    "Created: / 15-01-2013 / 11:26:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 diffs
@@ -219,10 +228,30 @@
     ^stream nextPut: self
 
     "Created: / 05-12-2009 / 11:06:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+sort
+    self sort: [:a :b|a printString < b printString ].
+
+    "Created: / 17-01-2013 / 13:56:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+sort: sortBlock
+    self subclassResponsibility
+
+    "Created: / 17-01-2013 / 13:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetDiffComponent methodsFor:'testing'!
 
+isConflict
+    "Return true, if there is a conflict."
+
+    ^ self subclassResponsibility
+
+    "Modified (comment): / 01-08-2012 / 17:11:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isDiffItem
     ^ false
 !
@@ -236,6 +265,13 @@
     ^false
 !
 
+isForCopyrightMethod
+    "Returns true, if this is an entry for #copyright method"
+    ^self subclassResponsibility
+
+    "Created: / 01-08-2012 / 16:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isForVersionMethod
     "Returns true, if this is an entry for version method"
     ^self subclassResponsibility
@@ -252,5 +288,6 @@
 !ChangeSetDiffComponent class methodsFor:'documentation'!
 
 version_SVN
-    ^ '§Id: ChangeSetDiffComponent.st 1920 2012-04-18 20:21:56Z vranyj1 §'
+    ^ '$Id: ChangeSetDiffComponent.st,v 1.5 2014-02-05 17:52:14 cg Exp $'
 ! !
+