# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1343644653 -7200
# Node ID 4d63f8a007873f57014f5af4c54cd3d13878030d
# Parent  42828b0ace98272cecc41dce8eec829b73bd77ee# Parent  9dda5c1f6a45a1cbbd331aa415083e59fcfad708
merge with stable

diff -r 42828b0ace98 -r 4d63f8a00787 hgext/obsolete.py
diff -r 42828b0ace98 -r 4d63f8a00787 hgext/qsync.py
--- a/hgext/qsync.py	Sun Jul 29 17:25:47 2012 +0200
+++ b/hgext/qsync.py	Mon Jul 30 12:37:33 2012 +0200
@@ -86,7 +86,7 @@
                 obsolete = extensions.find('obsolete')
                 newnodes = obsolete.newerversion(repo, oldnode)
                 if newnodes:
-                    newnodes = [n for n in newnodes if n] # remove killing
+                    newnodes = [n for n in newnodes if n and n[0] in repo] # remove killing
                 if not newnodes:
                     # changeset has been killed (eg. reject)
                     pass
@@ -175,7 +175,7 @@
         oldnode = bin(oldhex)
         newnodes = obsolete.newerversion(repo, oldnode)
         if newnodes:
-            newnodes = [n for n in newnodes if n] # remove killing
+            newnodes = [n for n in newnodes if n and n[0] in repo] # remove killing
             if len(newnodes) > 1:
                 newnodes = [short(nodes[0]) for nodes in newnodes]
                 raise util.Abort('%s have more than one newer version: %s'% (oldname, newnodes))