[Updated] D12188: filemerge: remove an unnecessary join with absolute path

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG218154867575: filemerge: remove an unnecessary join with absolute path (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12188?vs=32226&id=32244

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12188/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12188

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -745,7 +745,7 @@
     args = _toolstr(repo.ui, tool, b"args")
 
     with _maketempfiles(
-        fco, fca, repo.wvfs.join(backup.path()), b"$output" in args
+        fco, fca, backup.path(), b"$output" in args
     ) as temppaths:
         basepath, otherpath, localoutputpath = temppaths
         outpath = b""



To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220216/c6f6b375/attachment-0002.html>