Show More
@@ -646,10 +646,6 b' def checkparents(repo, state):' | |||
|
646 | 646 | raise error.Abort(_('working directory parents do not match unshelve ' |
|
647 | 647 | 'state')) |
|
648 | 648 | |
|
649 | def pathtofiles(repo, files): | |
|
650 | cwd = repo.getcwd() | |
|
651 | return [repo.pathto(f, cwd) for f in files] | |
|
652 | ||
|
653 | 649 | def unshelveabort(ui, repo, state, opts): |
|
654 | 650 | """subcommand that abort an in-progress unshelve""" |
|
655 | 651 | with repo.lock(): |
@@ -689,7 +685,6 b' def mergefiles(ui, repo, wctx, shelvectx' | |||
|
689 | 685 | scmutil.backuppath(ui, repo, file)) |
|
690 | 686 | ui.pushbuffer(True) |
|
691 | 687 | cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), |
|
692 | *pathtofiles(repo, files), | |
|
693 | 688 | **{r'no_backup': True}) |
|
694 | 689 | ui.popbuffer() |
|
695 | 690 |
General Comments 0
You need to be logged in to leave comments.
Login now