Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 41602:92bd3d86f2e0
resolve: migrate to scmutil.backuppath()
Differential Revision: https://phab.mercurial-scm.org/D5858
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 04 Feb 2019 21:31:18 -0800 |
| parents | 5f827e9ce870 |
| children | eeab8c1c926b |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Feb 04 21:19:05 2019 -0800 +++ b/mercurial/commands.py Mon Feb 04 21:31:18 2019 -0800 @@ -4971,7 +4971,7 @@ if complete: try: util.rename(a + ".resolve", - scmutil.origpath(ui, repo, a)) + scmutil.backuppath(ui, repo, f)) except OSError as inst: if inst.errno != errno.ENOENT: raise @@ -4997,7 +4997,7 @@ # replace filemerge's .orig file with our resolve file a = repo.wjoin(f) try: - util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) + util.rename(a + ".resolve", scmutil.backuppath(ui, repo, f)) except OSError as inst: if inst.errno != errno.ENOENT: raise