Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: retrieve bookmarks before obsmarkers
authorPierre-Yves David <pierre-yves.david@fb.com>
Sat, 27 Sep 2014 01:37:56 -0700
changeset 22655 f48ac29c2a9e
parent 22654 02e0a574bcd3
child 22656 c9276945eba3
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.
mercurial/exchange.py file | annotate | diff | comparison | revisions 
--- 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()
Mercurial