merge with stable
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Sun, 25 Jan 2009 19:15:49 +0100
changeset 7802 dd970a311ea8
parent 7689 d821ea464465 (current diff)
parent 7708 a32847fa0df0 (diff)
child 7803 6d99ff7b79b5
merge with stable
mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sun Jan 25 18:55:29 2009 +0100
+++ b/mercurial/localrepo.py	Sun Jan 25 19:15:49 2009 +0100
@@ -1237,7 +1237,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)