facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

copies: deal with symmetric difference for linear relationships

Browse Source 
choose the minimum of symmetric difference and the two revs in question
This commit is contained in:
Matt Mackall 2008-03-15 16:25:27 -05:00
parent dae59277f3
commit 45a746ed3d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/copies.py
View File

@ -68,7 +68,7 @@ def copies(repo, c1, c2, ca):
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()