Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Thu, 26 Jul 2012 15:23:05 +0200
branchstable
changeset 395 822e5305e377
parent 376 188afb394e10 (current diff)
parent 394 f2168d0b5700 (diff)
child 396 9dda5c1f6a45
merge
--- 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))
evolve