# HG changeset patch # User Boris Feld # Date 1499700137 -7200 # Node ID 2a8ce4e79a47a8a90924c54ba8a0e07317d4f41b # Parent 146c0371eadf59ba0e59451f6d42afc366997bdc bookmark: use 'applychanges' when updating from a remote diff -r 146c0371eadf -r 2a8ce4e79a47 mercurial/bookmarks.py --- 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