Change.st
branchjv
changeset 3219 92e64a42ab4e
parent 3208 e8bdf898d7ac
parent 3212 bfb6d655dd9b
child 3435 d15ba356cc58
--- a/Change.st	Thu Apr 11 14:36:03 2013 +0200
+++ b/Change.st	Tue Apr 16 09:44:57 2013 +0200
@@ -50,7 +50,7 @@
 !Change class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/Change.st,v 1.64 2013-03-30 14:12:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/Change.st,v 1.65 2013-04-14 06:57:58 cg Exp $'
 ! !
 
 
@@ -177,14 +177,6 @@
     "Modified (format): / 25-07-2012 / 17:37:23 / cg"
 !
 
-mcDefinition
-    ^ mcDefinition
-!
-
-mcDefinition:something
-    mcDefinition := something.
-!
-
 nameSpaceOverride:ns
 
     "Created: / 20-03-2012 / 17:18:17 / cg"
@@ -367,6 +359,7 @@
 
 ! !
 
+
 !Change methodsFor:'queries'!
 
 isForGeneratedSubject
@@ -446,6 +439,13 @@
     "Created: / 7.2.1998 / 19:26:50 / cg"
 !
 
+isConflict
+    "true if this change is different than what is already in the image
+     (i.e. it overwrites some existing code)"
+
+    ^ true
+!
+
 isDoIt
     ^ false
 
@@ -565,7 +565,7 @@
 !Change class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/Change.st,v 1.64 2013-03-30 14:12:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/Change.st,v 1.65 2013-04-14 06:57:58 cg Exp $'
 !
 
 version_HG