changeset 36715 | 613954a17a25 |
parent 35879 | 6c1d3779c052 |
child 37451 | 444ed53f93df |
--- a/mercurial/discovery.py Sun Mar 04 13:04:12 2018 -0500 +++ b/mercurial/discovery.py Sun Mar 04 07:37:08 2018 -0800 @@ -57,7 +57,7 @@ if all(knownnode(h) for h in heads): return (heads, False, heads) - res = setdiscovery.findcommonheads(repo.ui, repo, remote, heads, + res = setdiscovery.findcommonheads(repo.ui, repo, remote, abortwhenunrelated=not force, ancestorsof=ancestorsof) common, anyinc, srvheads = res