Mercurial > hg > mutable-history

changeset 399:4d63f8a00787

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Mon, 30 Jul 2012 12:37:33 +0200
parents 42828b0ace98 (current diff) 9dda5c1f6a45 (diff)
children c2ef47fce3f9
files hgext/obsolete.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/qsync.py
+++ b/hgext/qsync.py
@@ -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))