--- a/SourceCodeManagerUtilities.st	Thu Aug 02 11:52:27 2001 +0200
+++ b/SourceCodeManagerUtilities.st	Wed Aug 15 17:36:37 2001 +0200
@@ -1042,17 +1042,19 @@
     self activityNotification:'updating...'.
     changedClasses := IdentitySet new.
 
-    answer == #load ifTrue:[
-        changedClassDefinitions do:[:eachChangeArr | "apply this change (go to rep-version)"
-                                     |cHere cRep| 
-                                     cHere := eachChangeArr at:1.
-                                     cRep := eachChangeArr at:2.
-                                     cRep apply.
-                                     cRep isMethodChange ifTrue:[
-                                         cRep changeMethod setPackage:(cRep changeClass package).
-                                         changedClasses add:cRep changeClass.
-                                     ]
-                   ].
+    Class withoutUpdatingChangesDo:[
+        answer == #load ifTrue:[
+            changedClassDefinitions do:[:eachChangeArr | "apply this change (go to rep-version)"
+                                         |cHere cRep| 
+                                         cHere := eachChangeArr at:1.
+                                         cRep := eachChangeArr at:2.
+                                         cRep apply.
+                                         cRep isMethodChange ifTrue:[
+                                             cRep changeMethod setPackage:(cRep changeClass package).
+                                             changedClasses add:cRep changeClass.
+                                         ]
+                       ].
+        ].
         onlyInRep do:[:eachChange | "apply this change (method only present in rep-version)"
                                      eachChange apply.
                                      eachChange isMethodChange ifTrue:[
@@ -1060,40 +1062,34 @@
                                          changedClasses add:eachChange changeClass.   
                                      ]
                      ].
-        onlyHere do:[:eachChange |   "remove this change (method not present in rep-version)"
-                                     |cClass cSel|
-                                     eachChange isMethodChange ifTrue:[
-                                         cClass := eachChange changeClass.
-                                         cSel := eachChange selector.
-                                         cClass removeSelector:cSel.
-                                     ]
-                    ].
-        changed do:[:eachChangeArr | "apply this change (go to rep-version)"
-                                     |cHere cRep| 
-                                     cHere := eachChangeArr at:1.
-                                     cRep := eachChangeArr at:2.
-                                     cRep apply.
-                                     cRep isMethodChange ifTrue:[
-                                         cRep changeMethod setPackage:(cRep changeClass package).
-                                         changedClasses add:cRep changeClass.
-                                     ]
-                   ].
-        "/ make all methods belong to the classes project
-        self setPackageOfAllMethodsIn:aClass to:aClass package.
-        versionMethodsRep size == 1 ifTrue:[
-            versionMethodsRep first apply.
+        answer == #load ifTrue:[
+            onlyHere do:[:eachChange |   "remove this change (method not present in rep-version)"
+                                         |cClass cSel|
+                                         eachChange isMethodChange ifTrue:[
+                                             cClass := eachChange changeClass.
+                                             cSel := eachChange selector.
+                                             cClass removeSelector:cSel.
+                                         ]
+                        ].
+            changed do:[:eachChangeArr | "apply this change (go to rep-version)"
+                                         |cHere cRep| 
+                                         cHere := eachChangeArr at:1.
+                                         cRep := eachChangeArr at:2.
+                                         cRep apply.
+                                         cRep isMethodChange ifTrue:[
+                                             cRep changeMethod setPackage:(cRep changeClass package).
+                                             changedClasses add:cRep changeClass.
+                                         ]
+                       ].
+            "/ make all methods belong to the classes project
             self setPackageOfAllMethodsIn:aClass to:aClass package.
-        ] ifFalse:[
-            self halt
+            versionMethodsRep size == 1 ifTrue:[
+                versionMethodsRep first apply.
+                self setPackageOfAllMethodsIn:aClass to:aClass package.
+            ] ifFalse:[
+                self halt
+            ].
         ].
-    ] ifFalse:[
-        onlyInRep do:[:eachChange | "apply this change (method only present in rep-version)"
-                                     eachChange apply.
-                                     eachChange isMethodChange ifTrue:[
-                                         eachChange changeMethod setPackage:(eachChange changeClass package).
-                                         changedClasses add:eachChange changeClass.   
-                                     ]
-                     ].
     ].
     changedClasses do:[:eachClass |
          eachClass changed:#projectOrganization.
@@ -1869,5 +1865,5 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.59 2001-08-02 09:52:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.60 2001-08-15 15:36:37 cg Exp $'
 ! !