diff -r 5b3717e1a3ea -r 9f3652e851f8 mercurial/bundle2.py --- a/mercurial/bundle2.py Mon Apr 21 20:04:54 2014 -0700 +++ b/mercurial/bundle2.py Mon Apr 21 17:51:58 2014 -0700 @@ -760,3 +760,9 @@ """Used to transmit unknown part error over the wire""" manargs = dict(inpart.mandatoryparams) raise UnknownPartError(manargs['parttype']) + +@parthandler('b2x:error:pushraced') +def handlereplycaps(op, inpart): + """Used to transmit push race error over the wire""" + manargs = dict(inpart.mandatoryparams) + raise error.ResponseError(_('push failed:'), manargs['message'])