--- a/mercurial/exchange.py Sat Feb 20 15:56:44 2016 -0800
+++ b/mercurial/exchange.py Fri Feb 19 22:28:09 2016 +0100
@@ -576,7 +576,8 @@
ancestors = repo.changelog.ancestors(revnums, inclusive=True)
remotebookmark = remote.listkeys('bookmarks')
- explicit = set(pushop.bookmarks)
+ explicit = set([repo._bookmarks.expandname(bookmark)
+ for bookmark in pushop.bookmarks])
comp = bookmod.compare(repo, repo._bookmarks, remotebookmark, srchex=hex)
addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp