Show More
@@ -352,7 +352,7 b' def unshelveabort(ui, repo, state, opts)' | |||
|
352 | 352 | revertfiles = readshelvedfiles(repo, state.name) |
|
353 | 353 | wctx = repo.parents()[0] |
|
354 | 354 | cmdutil.revert(ui, repo, wctx, [wctx.node(), nullid], |
|
355 |
*revertfiles, no_backup |
|
|
355 | *revertfiles, **{'no_backup': True}) | |
|
356 | 356 | # fix up the weird dirstate states the merge left behind |
|
357 | 357 | mf = wctx.manifest() |
|
358 | 358 | dirstate = repo.dirstate |
@@ -514,7 +514,7 b' def unshelve(ui, repo, *shelved, **opts)' | |||
|
514 | 514 | revertfiles = set(parents[1].files()).difference(ms) |
|
515 | 515 | cmdutil.revert(ui, repo, parents[1], |
|
516 | 516 | (parents[0].node(), nullid), |
|
517 |
*revertfiles, no_backup |
|
|
517 | *revertfiles, **{'no_backup': True}) | |
|
518 | 518 | raise error.InterventionRequired( |
|
519 | 519 | _("unresolved conflicts (see 'hg resolve', then " |
|
520 | 520 | "'hg unshelve --continue')")) |
@@ -523,7 +523,7 b' def unshelve(ui, repo, *shelved, **opts)' | |||
|
523 | 523 | parent = tip.parents()[0] |
|
524 | 524 | hg.update(repo, parent.node()) |
|
525 | 525 | cmdutil.revert(ui, repo, tip, repo.dirstate.parents(), *tip.files(), |
|
526 |
no_backup |
|
|
526 | **{'no_backup': True}) | |
|
527 | 527 | |
|
528 | 528 | prevquiet = ui.quiet |
|
529 | 529 | ui.quiet = True |
General Comments 0
You need to be logged in to leave comments.
Login now