changeset 35889 | 5cfdf6137af8 |
parent 35314 | 483b5dd0f1aa |
child 35919 | 6c1d3779c052 |
--- a/mercurial/discovery.py Thu Feb 01 08:17:11 2018 -0800 +++ b/mercurial/discovery.py Thu Feb 01 10:29:24 2018 -0800 @@ -62,7 +62,7 @@ if allknown: return (heads, False, heads) - res = setdiscovery.findcommonheads(repo.ui, repo, remote, + res = setdiscovery.findcommonheads(repo.ui, repo, remote, heads, abortwhenunrelated=not force, ancestorsof=ancestorsof) common, anyinc, srvheads = res