##// END OF EJS Templates
discovery: avoid wrongly saying there are nothing to pull...
marmoute -
r45166:b561f3a6 stable
parent child Browse files
Show More
@@ -67,6 +67,10 b' def findcommonincoming(repo, remote, hea'
67 ancestorsof=ancestorsof,
67 ancestorsof=ancestorsof,
68 )
68 )
69 common, anyinc, srvheads = res
69 common, anyinc, srvheads = res
70 if heads and not anyinc:
71 # server could be lying on the advertised heads
72 has_node = repo.changelog.hasnode
73 anyinc = any(not has_node(n) for n in heads)
70 return (list(common), anyinc, heads or list(srvheads))
74 return (list(common), anyinc, heads or list(srvheads))
71
75
72
76
@@ -249,12 +249,12 b' XXX: we should show better message when '
249 $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef
249 $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef
250 pulling from ssh://user@dummy/repo
250 pulling from ssh://user@dummy/repo
251 searching for changes
251 searching for changes
252 no changes found
253 adding changesets
252 adding changesets
254 adding manifests
253 adding manifests
255 adding file changes
254 adding file changes
256 added 4 changesets with 4 changes to 4 files
255 added 4 changesets with 4 changes to 4 files
257 new changesets eaba929e866c:b4e4bce66051
256 new changesets eaba929e866c:b4e4bce66051
257 (run 'hg update' to get a working copy)
258 $ hg glog
258 $ hg glog
259 o 5:b4e4bce66051 added e
259 o 5:b4e4bce66051 added e
260 | public
260 | public
General Comments 0
You need to be logged in to leave comments. Login now