comparison mercurial/localrepo.py @ 7709:752325f2208d

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 25 Jan 2009 12:09:51 -0600
parents 1574c2704b11 a32847fa0df0
children b7ac53f7b061
comparison
equal deleted inserted replaced
7707:64fd7f6d3b40 7709:752325f2208d
1240 1240
1241 for top, bottom in pairs: 1241 for top, bottom in pairs:
1242 n, l, i = top, [], 0 1242 n, l, i = top, [], 0
1243 f = 1 1243 f = 1
1244 1244
1245 while n != bottom: 1245 while n != bottom and n != nullid:
1246 p = self.changelog.parents(n)[0] 1246 p = self.changelog.parents(n)[0]
1247 if i == f: 1247 if i == f:
1248 l.append(n) 1248 l.append(n)
1249 f = f * 2 1249 f = f * 2
1250 n = p 1250 n = p