--- a/hgext/obsolete.py	Fri Jun 22 18:04:43 2012 +0200
+++ b/hgext/obsolete.py	Sat Jun 23 01:14:49 2012 +0200
@@ -853,7 +853,8 @@
             self._clearobsoletecache()
             # this is mainly for safety purpose
             # both pull and push
-            expobs = [c.node() for c in repo.set('extinct() - secret()')]
+            query = '(obsolete() - obsolete()::(unstable() - secret())) - secret()'
+            expobs = [c.node() for c in repo.set(query)]
             phases.retractboundary(repo, 2, expobs)
 
         ### Disk IO