# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1343308985 -7200
# Node ID 822e5305e377afc8bad481362fb282edc474b9d2
# Parent  188afb394e1013163ffe1be169f61f8ec95b3517# Parent  f2168d0b5700028e657fa233eafdf895a6cdd6da
merge

diff -r 188afb394e10 -r 822e5305e377 hgext/qsync.py
--- a/hgext/qsync.py	Wed Jul 25 17:43:38 2012 +0200
+++ b/hgext/qsync.py	Thu Jul 26 15:23:05 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))