Mercurial > hg

changeset 22655:f48ac29c2a9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: retrieve bookmarks before obsmarkers Retrieving bookmarks before obsmarkers will avoid turning some changesets hidden right before making them visible again if a bookmark keeps them visible.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 27 Sep 2014 01:37:56 -0700
parents 02e0a574bcd3
children c9276945eba3
files mercurial/exchange.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Sat Sep 27 01:31:15 2014 -0700
+++ b/mercurial/exchange.py	Sat Sep 27 01:37:56 2014 -0700
@@ -859,8 +859,8 @@
             _pullbundle2(pullop)
         _pullchangeset(pullop)
         _pullphase(pullop)
+        _pullbookmarks(pullop)
         _pullobsolete(pullop)
-        _pullbookmarks(pullop)
         pullop.closetransaction()
     finally:
         pullop.releasetransaction()