D5858: resolve: migrate to scmutil.backuppath()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Feb 6 21:04:57 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG31ae4129ff8a: resolve: migrate to scmutil.backuppath() (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5858?vs=13863&id=13880
REVISION DETAIL
https://phab.mercurial-scm.org/D5858
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list