Show More
@@ -616,7 +616,7 b' def _commonancestorheads(repo, subset, x' | |||
|
616 | 616 | |
|
617 | 617 | # These greatest common ancestors are the same ones that the consesus bid |
|
618 | 618 | # merge will find. |
|
619 |
h = heads(repo, fullreposet(repo), x, |
|
|
619 | h = heads(repo, fullreposet(repo), x, anyorder) | |
|
620 | 620 | |
|
621 | 621 | ancs = repo.changelog._commonancestorsheads(*list(h)) |
|
622 | 622 | return subset & baseset(ancs) |
@@ -632,7 +632,7 b' def commonancestors(repo, subset, x):' | |||
|
632 | 632 | |
|
633 | 633 | """ |
|
634 | 634 | # only wants the heads of the set passed in |
|
635 |
for r in heads(repo, fullreposet(repo), x, |
|
|
635 | for r in heads(repo, fullreposet(repo), x, anyorder): | |
|
636 | 636 | subset &= dagop.revancestors(repo, baseset([r])) |
|
637 | 637 | |
|
638 | 638 | return subset |
General Comments 0
You need to be logged in to leave comments.
Login now