# HG changeset patch # User Yuya Nishihara # Date 2018-07-10 14:01:53 # Node ID 607e2a2501e69d946b2b2848e52bf7aa8c338d0e # Parent b93dc48e74adfcbb53fc1c9e95b42e30fd32e95e revset: clarify heads() order doesn't matter while computing common ancestors Follows up 5460926352ee and 52f19a840543. diff --git a/mercurial/revset.py b/mercurial/revset.py --- a/mercurial/revset.py +++ b/mercurial/revset.py @@ -616,7 +616,7 @@ def _commonancestorheads(repo, subset, x # These greatest common ancestors are the same ones that the consesus bid # merge will find. - h = heads(repo, fullreposet(repo), x, defineorder) + h = heads(repo, fullreposet(repo), x, anyorder) ancs = repo.changelog._commonancestorsheads(*list(h)) return subset & baseset(ancs) @@ -632,7 +632,7 @@ def commonancestors(repo, subset, x): """ # only wants the heads of the set passed in - for r in heads(repo, fullreposet(repo), x, defineorder): + for r in heads(repo, fullreposet(repo), x, anyorder): subset &= dagop.revancestors(repo, baseset([r])) return subset