merge with crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Tue, 03 Jul 2007 12:46:34 +0200
changeset 4782 7cd8a00d08de
parent 4780 8b90d763ea90 (current diff)
parent 4781 62c56d8f368b (diff)
child 4783 be78ab217109
merge with crew-stable
--- 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):