# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1345509473 -7200
# Node ID cd43fd9f923fc844efa5601618224482c77d644d
# Parent  3477326461e3a41cbb772014d37725acc459ce4e# Parent  19bba3c912468ddaa377511e886de66aaf337e1f
merge

diff -r 3477326461e3 -r cd43fd9f923f hgext/obsolete.py
--- 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)