Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/localrepo.py @ 3925:27230c29bfec 0.9.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix calculation of new heads added during push with -r fix issue450
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 17 Dec 2006 05:00:22 +0100
parents 46abbed02b2d
children 4df475e22248 e7282dede8cd
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1392,7 +1392,7 @@ class localrepository(repo.repository):
                 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)