Mercurial > hg
changeset 6277:cfebb175704f
copies: deal with symmetric difference for linear relationships
choose the minimum of symmetric difference and the two revs in question
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 15 Mar 2008 16:25:27 -0500 |
parents | c93ca83a3354 |
children | 81e7112b07ae |
files | mercurial/copies.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Sat Mar 15 16:24:16 2008 -0500 +++ b/mercurial/copies.py Sat Mar 15 16:25:27 2008 -0500 @@ -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)) + limit = min(ancestor.symmetricdifference(rev1, rev2, parents) + [rev1, rev2]) m1 = c1.manifest() m2 = c2.manifest() ma = ca.manifest()