##// END OF EJS Templates
revset: clarify heads() order doesn't matter while computing common ancestors...
Yuya Nishihara -
r38726:607e2a25 default
parent child Browse files
Show More
@@ -616,7 +616,7 b' def _commonancestorheads(repo, subset, x'
616
616
617 # These greatest common ancestors are the same ones that the consesus bid
617 # These greatest common ancestors are the same ones that the consesus bid
618 # merge will find.
618 # merge will find.
619 h = heads(repo, fullreposet(repo), x, defineorder)
619 h = heads(repo, fullreposet(repo), x, anyorder)
620
620
621 ancs = repo.changelog._commonancestorsheads(*list(h))
621 ancs = repo.changelog._commonancestorsheads(*list(h))
622 return subset & baseset(ancs)
622 return subset & baseset(ancs)
@@ -632,7 +632,7 b' def commonancestors(repo, subset, x):'
632
632
633 """
633 """
634 # only wants the heads of the set passed in
634 # only wants the heads of the set passed in
635 for r in heads(repo, fullreposet(repo), x, defineorder):
635 for r in heads(repo, fullreposet(repo), x, anyorder):
636 subset &= dagop.revancestors(repo, baseset([r]))
636 subset &= dagop.revancestors(repo, baseset([r]))
637
637
638 return subset
638 return subset
General Comments 0
You need to be logged in to leave comments. Login now