comparison mercurial/localrepo.py @ 9102:bbc78cb1bf15

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 09 Jul 2009 19:49:02 -0500
parents 93fe89afc611 0b2b269ba3d0
children a5c060b80082
comparison
equal deleted inserted replaced
9092:9aebeea7ac00 9102:bbc78cb1bf15
471 # starting from tip means fewer passes over reachable 471 # starting from tip means fewer passes over reachable
472 while newnodes: 472 while newnodes:
473 latest = newnodes.pop() 473 latest = newnodes.pop()
474 if latest not in bheads: 474 if latest not in bheads:
475 continue 475 continue
476 reachable = self.changelog.reachable(latest, bheads[0]) 476 reachable = set()
477 for bh in bheads:
478 reachable |= self.changelog.reachable(latest, bh)
477 bheads = [b for b in bheads if b not in reachable] 479 bheads = [b for b in bheads if b not in reachable]
478 newbheads.insert(0, latest) 480 newbheads.insert(0, latest)
479 bheads.extend(newbheads) 481 bheads.extend(newbheads)
480 partial[branch] = bheads 482 partial[branch] = bheads
481 483