diff -r 0c1185f6ddd7 -r 743d04dd48ec mercurial/localrepo.py --- a/mercurial/localrepo.py Fri Oct 19 00:46:39 2012 +0200 +++ b/mercurial/localrepo.py Fri Oct 19 00:50:12 2012 +0200 @@ -1872,6 +1872,7 @@ # this message are here for 80 char limit reason mso = _("push includes obsolete changeset: %s!") msu = _("push includes unstable changeset: %s!") + msb = _("push includes bumped changeset: %s!") # If we are to push if there is at least one # obsolete or unstable changeset in missing, at # least one of the missinghead will be obsolete or @@ -1882,6 +1883,8 @@ raise util.Abort(_(mso) % ctx) elif ctx.unstable(): raise util.Abort(_(msu) % ctx) + elif ctx.bumped(): + raise util.Abort(_(msb) % ctx) discovery.checkheads(self, remote, outgoing, remoteheads, newbranch, bool(inc))