equal
deleted
inserted
replaced
257 |
257 |
258 with repo.transaction(b'repair') as tr: |
258 with repo.transaction(b'repair') as tr: |
259 bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] |
259 bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] |
260 repo._bookmarks.applychanges(repo, tr, bmchanges) |
260 repo._bookmarks.applychanges(repo, tr, bmchanges) |
261 |
261 |
262 transaction.cleanup_undo_files(repo) |
262 transaction.cleanup_undo_files(repo.ui.warn, repo.vfs_map) |
263 |
263 |
264 except: # re-raises |
264 except: # re-raises |
265 if backupfile: |
265 if backupfile: |
266 ui.warn( |
266 ui.warn( |
267 _(b"strip failed, backup bundle stored in '%s'\n") |
267 _(b"strip failed, backup bundle stored in '%s'\n") |