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
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Tue, 21 Aug 2012 02:37:53 +0200
changeset 461 cd43fd9f923f
parent 459 3477326461e3 (current diff)
parent 460 19bba3c91246 (diff)
child 462 d38e02332c2c
merge
hgext/obsolete.py file | annotate | diff | comparison | revisions 
--- a/hgext/obsolete.py	Wed Aug 15 16:54:48 2012 +0200
+++ b/hgext/obsolete.py	Tue Aug 21 02:37:53 2012 +0200
@@ -707,6 +707,8 @@
         nc = toproceed.pop()
         for mark in allobjects.get(nc, ()):
             for sub in mark[1]:
+                if sub == nullid:
+                    continue # should not be here!
                 if sub not in seen:
                     seen.add(sub)
                     toproceed.append(sub)
evolve