diff -r 0275000564c4 -r 8407031f195f mercurial/bundle2.py --- a/mercurial/bundle2.py Thu Feb 13 22:06:57 2020 -0500 +++ b/mercurial/bundle2.py Thu Feb 13 22:51:17 2020 -0500 @@ -2368,6 +2368,11 @@ b'prepushkey', throw=True, **pycompat.strkwargs(hookargs) ) + for book, node in changes: + if bookmarks.isdivergent(book): + msg = _(b'cannot accept divergent bookmark %s!') % book + raise error.Abort(msg) + bookstore.applychanges(op.repo, op.gettransaction(), changes) if pushkeycompat: