Mercurial > hg
changeset 22224:f713de1d3916
push: update bookmarks within the remote lock
Updating bookmarks is part of the push. It should be done within the same lock
as the other steps of the push.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 15 Aug 2014 15:25:12 -0700 |
parents | c39d404f0eb0 |
children | baecf4e1b7d0 |
files | mercurial/exchange.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/exchange.py Mon Aug 18 12:12:57 2014 -0700 +++ b/mercurial/exchange.py Fri Aug 15 15:25:12 2014 -0700 @@ -187,6 +187,7 @@ _pushchangeset(pushop) _pushsyncphase(pushop) _pushobsolete(pushop) + _pushbookmark(pushop) finally: if lock is not None: lock.release() @@ -194,7 +195,6 @@ if locallock is not None: locallock.release() - _pushbookmark(pushop) return pushop.ret # list of steps to perform discovery before push