# HG changeset patch # User Pierre-Yves David # Date 1408152381 25200 # Node ID a3dc2d3854908c84b44736ba9a8f2a72c286404c # Parent 98cbd41cb53273ec38483082bc42cea9803ac142 pushbookmark: do not attempt to update bookmarks if the push failed (BC) Before this patch, there was always an attempt to update bookmark even if prior steps of the push failed. I cannot see a good semantic reason to do so. We disable this possibility to simplify the push flow with bundle2. Bookmarks will be included in the bundle and fail with other steps. diff -r 98cbd41cb532 -r a3dc2d385490 mercurial/exchange.py --- a/mercurial/exchange.py Fri Aug 15 17:58:15 2014 -0700 +++ b/mercurial/exchange.py Fri Aug 15 18:26:21 2014 -0700 @@ -613,6 +613,8 @@ def _pushbookmark(pushop): """Update bookmark position on remote""" + if pushop.ret == 0: + return ui = pushop.ui repo = pushop.repo.unfiltered() remote = pushop.remote