diff mercurial/exchange.py @ 22666:0f8120c1ecf5

pull: perform bookmark updates in the transaction
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 28 Sep 2014 15:21:38 -0700
parents a8f0d8e4c80a
children 68439b154063
line wrap: on
line diff
--- a/mercurial/exchange.py	Sun Sep 28 00:41:55 2014 -0700
+++ b/mercurial/exchange.py	Sun Sep 28 15:21:38 2014 -0700
@@ -1015,6 +1015,7 @@
     remotebookmarks = pullop.remotebookmarks
     bookmod.updatefromremote(repo.ui, repo, remotebookmarks,
                              pullop.remote.url(),
+                             pullop.gettransaction,
                              explicit=pullop.explicitbookmarks)
 
 def _pullobsolete(pullop):