Merge with stable
authorMatt Mackall <mpm@selenic.com>
Sun, 25 Jan 2009 12:09:51 -0600
changeset 7709 752325f2208d
parent 7707 64fd7f6d3b40 (current diff)
parent 7708 a32847fa0df0 (diff)
child 7710 88326ee85a1b
Merge with stable
mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sun Jan 25 12:07:41 2009 -0600
+++ b/mercurial/localrepo.py	Sun Jan 25 12:09:51 2009 -0600
@@ -1242,7 +1242,7 @@
             n, l, i = top, [], 0
             f = 1
 
-            while n != bottom:
+            while n != bottom and n != nullid:
                 p = self.changelog.parents(n)[0]
                 if i == f:
                     l.append(n)