# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1232907349 -3600
# Node ID dd970a311ea863376414d77b3b680e206f75e96e
# Parent  d821ea4644658725e4b37848bbd71de28368d118# Parent  a32847fa0df0558a87446a15ea7b733c0f2e163d
merge with stable

diff -r d821ea464465 -r dd970a311ea8 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)