Submitter | Pierre-Yves David |
---|---|
Date | Aug. 18, 2014, 11:48 p.m. |
Message ID | <9435cddbb3cb5dff6cfd.1408405681@marginatus.alto.octopoid.net> |
Download | mbox | patch |
Permalink | /patch/5489/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -631,12 +631,13 @@ def _pushobsolete(pushop): msg = _('failed to push some obsolete markers!\n') repo.ui.warn(msg) def _pushbookmark(pushop): """Update bookmark position on remote""" - if pushop.ret == 0: + if pushop.ret == 0 or 'bookmarks' in pushop.stepsdone: return + pushop.stepsdone.add('bookmarks') ui = pushop.ui remote = pushop.remote for b, old, new in pushop.outbookmarks: if remote.pushkey('bookmarks', b, old, new): ui.status(_("updating bookmark %s\n") % b)