--- a/mercurial/exchange.py Fri Aug 15 19:03:42 2014 -0700
+++ b/mercurial/exchange.py Mon Aug 18 20:23:37 2014 -0400
@@ -295,7 +295,7 @@
remotebookmark = remote.listkeys('bookmarks')
comp = bookmarks.compare(repo, repo._bookmarks, remotebookmark, srchex=hex)
- (addsrc, adddst, advsrc, advdst, diverge, differ, invalid) = comp
+ addsrc, adddst, advsrc, advdst, diverge, differ, invalid = comp
for b, scid, dcid in advsrc:
if not ancestors or repo[scid].rev() in ancestors:
pushop.outbookmarks.append((b, dcid, scid))