--- a/ChangeSet.st	Mon Oct 09 13:14:20 2006 +0200
+++ b/ChangeSet.st	Mon Oct 09 14:08:05 2006 +0200
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libbasic3' }"
 
 OrderedCollection subclass:#ChangeSet
@@ -718,6 +717,21 @@
     "Modified: / 14.11.2001 / 13:35:52 / cg"
 !
 
+addMethodPackageChange:aMethod package:newPackage in:aClass
+    "add a methodPackage change to the receiver"
+
+    |newChange|
+
+    newChange := MethodPackageChange 
+                        class:aClass
+                        selector:(aClass selectorAtMethod:aMethod)
+                        package:newPackage.
+    self rememberChangedClass:aClass.
+    self addChange:newChange
+
+    "Created: / 09-10-2006 / 14:02:33 / cg"
+!
+
 addMethodPrivacyChange:aMethod in:aClass
     "add a methodPrivacy change to the receiver"
 
@@ -887,8 +901,9 @@
 includesChangeForClass:aClass
     |nameOfClass|
 
+    (self changedClasses includes:aClass) ifFalse:[^ false].
+
     nameOfClass := aClass theNonMetaclass name.
-
     ^ self contains:[:aChange | aChange className = nameOfClass]
 
     "
@@ -897,7 +912,7 @@
      ChangeSet current includesChangeForClass:SourceCodeManagerUtilities
     "
 
-    "Modified: / 31.10.2001 / 10:58:40 / cg"
+    "Modified: / 09-10-2006 / 13:39:22 / cg"
 !
 
 includesChangeForClass:aClass selector:selector
@@ -928,6 +943,10 @@
 includesChangeForClassOrMetaclass:aClass
     |nameOfClass nameOfMetaclass|
 
+    (self changedClasses includes:aClass theNonMetaclass) ifFalse:[
+        (self changedClasses includes:aClass theMetaclass) ifFalse:[^ false].
+    ].
+
     nameOfClass := aClass theNonMetaclass name.
     nameOfMetaclass := aClass theMetaclass name.
 
@@ -937,6 +956,8 @@
                         changeClassName := aChange className.
                         changeClassName = nameOfClass or:[changeClassName = nameOfMetaclass]
                     ]
+
+    "Modified: / 09-10-2006 / 13:40:29 / cg"
 !
 
 includesChangeForClassOrMetaclassOrPrivateClassOf:aClass
@@ -2065,5 +2086,5 @@
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.137 2006-09-26 15:24:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.138 2006-10-09 12:08:05 cg Exp $'
 ! !