Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/revlog.py @ 3499:ceaa3fefc10c
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 24 Oct 2006 13:46:04 -0500 |
parents | dba3cadef789 fd8f1110562c |
children | 0aef94f45ebf |
line wrap: on
line diff
--- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -737,13 +737,9 @@ class revlog(object): c = [] p = self.rev(node) for r in range(p + 1, self.count()): - n = self.node(r) - for pn in self.parents(n): - if pn == node: - c.append(n) - continue - elif pn == nullid: - continue + for pr in self.parentrevs(r): + if pr == p: + c.append(self.node(r)) return c def _match(self, id):