Mercurial > hg

changeset 33484:2a8ce4e79a47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmark: use 'applychanges' when updating from a remote
author Boris Feld <boris.feld@octobus.net>
date Mon, 10 Jul 2017 17:22:17 +0200
parents 146c0371eadf
children 505021482541
files mercurial/bookmarks.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bookmarks.py	Mon Jul 10 17:10:56 2017 +0200
+++ b/mercurial/bookmarks.py	Mon Jul 10 17:22:17 2017 +0200
@@ -579,10 +579,11 @@
 
     if changed:
         tr = trfunc()
+        changes = []
         for b, node, writer, msg in sorted(changed):
-            localmarks[b] = node
+            changes.append((b, node))
             writer(msg)
-        localmarks.recordchange(tr)
+        localmarks.applychanges(repo, tr, changes)
 
 def incoming(ui, repo, other):
     '''Show bookmarks incoming from other to repo