Mercurial > hg-stable

diff mercurial/localrepo.py @ 9102:bbc78cb1bf15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 09 Jul 2009 19:49:02 -0500
parents 93fe89afc611 0b2b269ba3d0
children a5c060b80082
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sat Jul 04 14:18:15 2009 +0100
+++ b/mercurial/localrepo.py	Thu Jul 09 19:49:02 2009 -0500
@@ -473,7 +473,9 @@
                 latest = newnodes.pop()
                 if latest not in bheads:
                     continue
-                reachable = self.changelog.reachable(latest, bheads[0])
+                reachable = set()
+                for bh in bheads:
+                    reachable |= self.changelog.reachable(latest, bh)
                 bheads = [b for b in bheads if b not in reachable]
                 newbheads.insert(0, latest)
             bheads.extend(newbheads)