--- a/mercurial/exchange.py Thu Nov 12 15:26:30 2015 -0600
+++ b/mercurial/exchange.py Tue Nov 10 11:13:21 2015 -0800
@@ -571,13 +571,7 @@
elif ctx.troubled():
raise error.Abort(mst[ctx.troubles()[0]] % ctx)
- # internal config: bookmarks.pushing
- newbm = pushop.ui.configlist('bookmarks', 'pushing')
- discovery.checkheads(unfi, pushop.remote, outgoing,
- pushop.remoteheads,
- pushop.newbranch,
- bool(pushop.incoming),
- newbm)
+ discovery.checkheads(pushop)
return True
# List of names of steps to perform for an outgoing bundle2, order matters.