# HG changeset patch # User Boris Feld # Date 1499701607 -7200 # Node ID 902fe63954a9a54709f0df6bf7b8ac671cfcfdc6 # Parent 870560c759edbcf1174950047cf4ba352f329a8f bookmark: use 'applychanges' in 'repair.strip' diff -r 870560c759ed -r 902fe63954a9 mercurial/repair.py --- a/mercurial/repair.py Mon Jul 10 17:44:25 2017 +0200 +++ b/mercurial/repair.py Mon Jul 10 17:46:47 2017 +0200 @@ -219,11 +219,10 @@ f.close() repo._phasecache.invalidate() - for m in updatebm: - bm[m] = repo[newbmtarget].node() with repo.transaction('repair') as tr: - bm.recordchange(tr) + bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] + bm.applychanges(repo, tr, bmchanges) # remove undo files for undovfs, undofile in repo.undofiles():