branch | stable |
changeset 23081 | e62c330a044f |
parent 23047 | f10019d2ee0a |
child 23082 | 0fc4686de1d7 |
--- a/mercurial/exchange.py Fri Oct 24 15:52:20 2014 -0500 +++ b/mercurial/exchange.py Fri Oct 24 10:40:37 2014 -0700 @@ -333,7 +333,7 @@ explicit = set(pushop.bookmarks) comp = bookmod.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) - addsrc, adddst, advsrc, advdst, diverge, differ, invalid = comp + addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp for b, scid, dcid in advsrc: if b in explicit: explicit.remove(b)