--- a/hgext/qsync.py Tue Jul 17 19:47:54 2012 +0200
+++ b/hgext/qsync.py Wed Jul 18 12:40:41 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))