Mercurial > hg-stable
changeset 33490:902fe63954a9
bookmark: use 'applychanges' in 'repair.strip'
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 10 Jul 2017 17:46:47 +0200 |
parents | 870560c759ed |
children | 1adcb594eb6b |
files | mercurial/repair.py |
diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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():