--- a/ClassCommentChange.st	Sun Apr 14 08:55:37 2013 +0200
+++ b/ClassCommentChange.st	Sun Apr 14 08:57:10 2013 +0200
@@ -47,7 +47,7 @@
 !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'!
@@ -71,6 +71,16 @@
 
 !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,12 +103,10 @@
 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'!
@@ -122,7 +130,9 @@
 "/    ns notNil ifTrue:[
 "/        aStream nextPutAll:ns; nextPutAll:'::'
 "/    ].
-    aStream nextPutAll:self className; nextPutAll:' comment:'
+    aStream 
+        nextPutAll:self className; 
+        nextPutAll:' comment:'
 !
 
 printWithoutClassNameOn:aStream
@@ -151,5 +161,6 @@
 !ClassCommentChange class methodsFor:'documentation'!
 
 version
-    ^ '$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 $'
 ! !
+