mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
copies: deal with symmetric difference for linear relationships
choose the minimum of symmetric difference and the two revs in question
This commit is contained in:
parent
dae59277f3
commit
45a746ed3d
@ -68,7 +68,7 @@ def copies(repo, c1, c2, ca):
|
|||||||
pr = repo.changelog.parentrevs
|
pr = repo.changelog.parentrevs
|
||||||
def parents(rev):
|
def parents(rev):
|
||||||
return [p for p in pr(rev) if p != nullrev]
|
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()
|
m1 = c1.manifest()
|
||||||
m2 = c2.manifest()
|
m2 = c2.manifest()
|
||||||
ma = ca.manifest()
|
ma = ca.manifest()
|
||||||
|
Loading…
Reference in New Issue
Block a user