--- a/ClassCommentChange.st	Thu Apr 11 14:36:03 2013 +0200
+++ b/ClassCommentChange.st	Tue Apr 16 09:44:57 2013 +0200
@@ -44,12 +44,14 @@
 "
 ! !
 
+
 !ClassCommentChange class methodsFor:'others'!
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic3/ClassCommentChange.st,v 1.34 2011/11/25 16:45:02 cg Exp §'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassCommentChange.st,v 1.35 2013-04-14 06:57:10 cg Exp $'
 ! !
 
+
 !ClassCommentChange methodsFor:'accessing'!
 
 className:clsName comment:aCommentString
@@ -69,8 +71,19 @@
     "Created: / 16.2.1998 / 14:16:45 / cg"
 ! !
 
+
 !ClassCommentChange methodsFor:'comparing'!
 
+isConflict
+    "true if this change is different than what is already in the image
+     (i.e. it overwrites some existing code)"
+
+    |cls|
+
+    ^ (cls := self changeClass) notNil
+    and:[ cls comment ~= self comment ]
+!
+
 isForSameAs:changeB
     "return true, if the given change represents a change for the same
      thingy as the receiver (i.e. same method, same definition etc.)."
@@ -93,14 +106,13 @@
 source
     "synthesize the changes source"
 
-    ^ String
-        streamContents:
-            [:s |
-                self printOn:s.
-                comment storeOn:s.
-            ]
+    ^ String streamContents: [:s |
+            self printOn:s.
+            comment storeOn:s.
+        ]
 ! !
 
+
 !ClassCommentChange methodsFor:'converting'!
 
 asAntiChange
@@ -110,6 +122,7 @@
     "Created: / 26-11-2009 / 16:09:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ClassCommentChange methodsFor:'printing & storing'!
 
 printOn:aStream
@@ -122,7 +135,9 @@
 "/    ns notNil ifTrue:[
 "/        aStream nextPutAll:ns; nextPutAll:'::'
 "/    ].
-    aStream nextPutAll:self className; nextPutAll:' comment:'
+    aStream 
+        nextPutAll:self className; 
+        nextPutAll:' comment:'
 !
 
 printWithoutClassNameOn:aStream
@@ -132,6 +147,7 @@
     aStream nextPutAll:'comment:'
 ! !
 
+
 !ClassCommentChange methodsFor:'queries'!
 
 isClassCommentChange
@@ -140,6 +156,7 @@
 
 ! !
 
+
 !ClassCommentChange methodsFor:'visiting'!
 
 acceptChangeVisitor:aVisitor
@@ -148,10 +165,11 @@
     "Created: / 25-11-2011 / 17:13:02 / cg"
 ! !
 
+
 !ClassCommentChange class methodsFor:'documentation'!
 
 version
-    ^ '$Header: ClassCommentChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassCommentChange.st,v 1.35 2013-04-14 06:57:10 cg Exp $'
 !
 
 version_HG