--- a/mercurial/discovery.py Thu Apr 16 22:30:11 2020 +0900
+++ b/mercurial/discovery.py Thu Apr 16 22:51:09 2020 +0530
@@ -67,6 +67,10 @@
ancestorsof=ancestorsof,
)
common, anyinc, srvheads = res
+ if heads and not anyinc:
+ # server could be lying on the advertised heads
+ has_node = repo.changelog.hasnode
+ anyinc = any(not has_node(n) for n in heads)
return (list(common), anyinc, heads or list(srvheads))
--- a/setup.py Thu Apr 16 22:30:11 2020 +0900
+++ b/setup.py Thu Apr 16 22:51:09 2020 +0530
@@ -1313,6 +1313,9 @@
if sys.platform == 'darwin':
osutil_ldflags += ['-framework', 'ApplicationServices']
+if sys.platform == 'sunos5':
+ osutil_ldflags += ['-lsocket']
+
xdiff_srcs = [
'mercurial/thirdparty/xdiff/xdiffi.c',
'mercurial/thirdparty/xdiff/xprepare.c',
--- a/tests/test-infinitepush-ci.t Thu Apr 16 22:30:11 2020 +0900
+++ b/tests/test-infinitepush-ci.t Thu Apr 16 22:51:09 2020 +0530
@@ -249,12 +249,12 @@
$ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef
pulling from ssh://user@dummy/repo
searching for changes
- no changes found
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
new changesets eaba929e866c:b4e4bce66051
+ (run 'hg update' to get a working copy)
$ hg glog
o 5:b4e4bce66051 added e
| public