--- a/Method.st	Mon Apr 01 13:42:45 2013 +0100
+++ b/Method.st	Tue Apr 16 14:27:04 2013 +0200
@@ -971,6 +971,7 @@
     "Modified (format): / 18-11-2011 / 14:47:06 / cg"
 ! !
 
+
 !Method methodsFor:'accessing-visibility'!
 
 isIgnored
@@ -1445,6 +1446,7 @@
     ^ temporaryMethod
 ! !
 
+
 !Method methodsFor:'copying'!
 
 copy
@@ -2682,6 +2684,19 @@
     ^ (res := self resources) notNil and:[res includesKey:#obsolete]
 !
 
+isShadowingExtension
+    "return true, if this method is an extension (i.e. package ~= classes' package)
+     which shadows an existing method from another package (i.e. a package conflict)"
+
+    |myClass myProjectDefinition|
+
+    myClass := self mclass theNonMetaclass.
+    ^ myClass notNil
+        and:[ package ~= myClass package
+        and:[ (myProjectDefinition := myClass projectDefinitionClass) notNil
+        and:[ (myProjectDefinition savedOverwrittenMethodForClass:self mclass selector:self selector) notNil ]]]
+!
+
 isSynthetic
     "a syntheric method does not really exist - it is only shown in a browser's list"
 
@@ -3579,6 +3594,7 @@
     "Created: / 23-07-2012 / 11:16:36 / cg"
 ! !
 
+
 !Method methodsFor:'source management'!
 
 revisionInfo
@@ -3833,6 +3849,11 @@
     ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.407 2013-03-13 14:01:11 cg Exp $'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '§ Id: Method.st 10648 2011-06-23 15:55:10Z vranyj1 §'
 ! !