Show More
@@ -308,11 +308,11 b' def softstrip(ui, repo, nodelist, backup' | |||||
308 | if not tostrip: |
|
308 | if not tostrip: | |
309 | return None |
|
309 | return None | |
310 |
|
310 | |||
311 | newbmtarget, updatebm = _bookmarkmovements(repo, tostrip) |
|
|||
312 | if backup: |
|
311 | if backup: | |
313 | node = tostrip[0] |
|
312 | node = tostrip[0] | |
314 | backupfile = _createstripbackup(repo, tostrip, node, topic) |
|
313 | backupfile = _createstripbackup(repo, tostrip, node, topic) | |
315 |
|
314 | |||
|
315 | newbmtarget, updatebm = _bookmarkmovements(repo, tostrip) | |||
316 | with repo.transaction(b'strip') as tr: |
|
316 | with repo.transaction(b'strip') as tr: | |
317 | phases.retractboundary(repo, tr, phases.archived, tostrip) |
|
317 | phases.retractboundary(repo, tr, phases.archived, tostrip) | |
318 | bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] |
|
318 | bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] |
General Comments 0
You need to be logged in to leave comments.
Login now