# HG changeset patch # User Matt Mackall # Date 1232906991 21600 # Node ID 752325f2208d4279a4fc892adddd1bfbc61b0ad1 # Parent 64fd7f6d3b40be58070c3033038b537ba4d80220# Parent a32847fa0df0558a87446a15ea7b733c0f2e163d Merge with stable diff -r 64fd7f6d3b40 -r 752325f2208d 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)