changeset 41609 | 630af04d4ae4 |
parent 41419 | 0bd56c291359 |
child 41768 | aaad36b88298 |
--- a/hgext/shelve.py Mon Feb 04 20:46:33 2019 -0800 +++ b/hgext/shelve.py Mon Feb 04 20:49:45 2019 -0800 @@ -679,7 +679,8 @@ # revert will overwrite unknown files, so move them out of the way for file in repo.status(unknown=True).unknown: if file in files: - util.rename(file, scmutil.origpath(ui, repo, file)) + util.rename(repo.wjoin(file), + scmutil.backuppath(ui, repo, file)) ui.pushbuffer(True) cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), *pathtofiles(repo, files),