# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1411807076 25200
# Node ID f48ac29c2a9e24b6df96115464556b8dd767533e
# Parent  02e0a574bcd3dbdc7a25a2f506e6678bf7f71398
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.

diff -r 02e0a574bcd3 -r f48ac29c2a9e mercurial/exchange.py
--- 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()