# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1183459594 -7200
# Node ID 7cd8a00d08deafb915e8f1d3d14cfb95b62d30cb
# Parent  8b90d763ea9032d40f4c6c72c7228224e84ae5ae# Parent  62c56d8f368bd2962bec314240f619d6a153679d
merge with crew-stable

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -756,9 +756,13 @@ class revlog(object):
         c = []
         p = self.rev(node)
         for r in range(p + 1, self.count()):
-            for pr in self.parentrevs(r):
-                if pr == p:
-                    c.append(self.node(r))
+            prevs = [pr for pr in self.parentrevs(r) if pr != nullrev]
+            if prevs:
+                for pr in prevs:
+                    if pr == p:
+                        c.append(self.node(r))
+            elif p == nullrev:
+                c.append(self.node(r))
         return c
 
     def _match(self, id):