diff -r 3732543d2393 -r 77c62d93cc76 SourceCodeManagerUtilities.st
--- a/SourceCodeManagerUtilities.st	Tue Mar 06 12:58:18 2012 +0100
+++ b/SourceCodeManagerUtilities.st	Tue Mar 06 16:41:27 2012 +0100
@@ -2047,16 +2047,17 @@
         diffSet := listHere diffSetsAgainst:listRep.
         changed := diffSet changed.
         onlyHere := diffSet onlyInReceiver.
-        onlyHere := onlyHere select:[:eachDiff|  
+
+        "/ reject extensions
+        onlyHere := onlyHere reject:[:eachDiff|  
                         |method methodsPackage|
-                        eachDiff isClassDefinitionChange not 
-                        and:[
-                            eachDiff changeClass isNil
-                            or:[
-                                method := (eachDiff changeClass compiledMethodAt:eachDiff selector).
-                                method isNil or:[ (methodsPackage := method package) == containerPackage ]]
-                        ]
-                    ].
+
+                        eachDiff isClassDefinitionChange  
+                        and:[ eachDiff changeClass notNil
+                        and:[ (method := (eachDiff changeClass compiledMethodAt:eachDiff selector)) notNil 
+                        and:[ (methodsPackage := method package) ~= containerPackage
+                        and:[ methodsPackage ~= PackageId noProjectID  ]]]]
+                    ]. 
 
         onlyInRep := diffSet onlyInArg.
 
@@ -2075,11 +2076,7 @@
             msg := msg , 'The repositories version contains %1 method(s) which are not in your current class.\'.
         ].
         onlyHere size > 0 ifTrue:[
-            onlyInRep size > 0 ifTrue:[
-                msg := msg , 'And there '.
-            ] ifFalse:[
-                msg := msg , 'There '.
-            ].
+            msg := msg , (onlyInRep size > 0 ifTrue:['And there '] ifFalse:['There ']).
             msg := msg , 'are %2 methods in your current class, which are not in the repository.\'.
         ].
         changed size > 0 ifTrue:[
@@ -2091,11 +2088,9 @@
             ]
         ].
         changedClassDefinitions size > 0 ifTrue:[
-            changedClassDefinitions size == 1 ifTrue:[
-                msg := msg , 'The class definition is different.\\'.
-            ] ifFalse:[
-                msg := msg , '%5 class definitions are different.\\'.
-            ]
+            msg := msg , (changedClassDefinitions size == 1 
+                            ifTrue:['The class definition is different.\\'] 
+                            ifFalse:['%5 class definitions are different.\\'])
         ].
 
         onlyHere isEmpty ifTrue:[
@@ -2285,7 +2280,7 @@
     ].
 
     "Modified: / 07-02-2001 / 18:18:32 / ps"
-    "Modified: / 10-02-2012 / 17:37:55 / cg"
+    "Modified: / 06-03-2012 / 16:40:33 / cg"
 !
 
 checkoutExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision askForMerge:askForMerge usingManager:aSourceCodeManager
@@ -4380,9 +4375,9 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.244 2012-03-06 11:58:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.245 2012-03-06 15:41:27 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.244 2012-03-06 11:58:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.245 2012-03-06 15:41:27 cg Exp $'
 ! !