--- a/mercurial/exchange.py Mon Dec 05 17:40:01 2016 +0100
+++ b/mercurial/exchange.py Tue Nov 22 01:33:31 2016 -0800
@@ -603,7 +603,8 @@
explicit = set([repo._bookmarks.expandname(bookmark)
for bookmark in pushop.bookmarks])
- comp = bookmod.compare(repo, repo._bookmarks, remotebookmark, srchex=hex)
+ comp = bookmod.comparebookmarks(repo, repo._bookmarks,
+ remotebookmark, srchex=hex)
addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp
for b, scid, dcid in advsrc:
if b in explicit: