Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 3928:4df475e22248

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync with -stable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Dec 2006 21:48:22 -0600
parents 6b4127c7d52a 27230c29bfec
children 01d98d68d697
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun Dec 17 18:45:46 2006 -0800
+++ b/mercurial/localrepo.py	Sun Dec 17 21:48:22 2006 -0600
@@ -1284,7 +1284,7 @@
                 newheads = list(heads)
                 for r in remote_heads:
                     if r in self.changelog.nodemap:
-                        desc = self.changelog.heads(r)
+                        desc = self.changelog.heads(r, heads)
                         l = [h for h in heads if h in desc]
                         if not l:
                             newheads.append(r)