changeset 6283 | 5a45c82fc7da |
parent 6277 | cfebb175704f |
child 6422 | 3ee6f1fce94a |
--- a/mercurial/copies.py Sat Mar 15 22:03:18 2008 -0300 +++ b/mercurial/copies.py Sat Mar 15 22:03:18 2008 -0300 @@ -68,7 +68,7 @@ pr = repo.changelog.parentrevs def parents(rev): return [p for p in pr(rev) if p != nullrev] - limit = min(ancestor.symmetricdifference(rev1, rev2, parents) + [rev1, rev2]) + limit = min(ancestor.symmetricdifference(rev1, rev2, parents)) m1 = c1.manifest() m2 = c2.manifest() ma = ca.manifest()