Mercurial > hg-stable

changeset 31332:102d3a30582c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: directly use repo.vfs.join The 'repo.join' method is about to be deprecated.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 08 Mar 2017 16:53:32 -0800
parents 4282feb79432
children e712a9c35fd8
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Mar 08 16:53:24 2017 -0800
+++ b/mercurial/merge.py	Wed Mar 08 16:53:32 2017 -0800
@@ -124,7 +124,7 @@
             self._mdstate = 's'
         else:
             self._mdstate = 'u'
-        shutil.rmtree(self._repo.join('merge'), True)
+        shutil.rmtree(self._repo.vfs.join('merge'), True)
         self._results = {}
         self._dirty = False
 
@@ -1678,7 +1678,7 @@
             repo.setparents(fp1, fp2)
             recordupdates(repo, actions, branchmerge)
             # update completed, clear state
-            util.unlink(repo.join('updatestate'))
+            util.unlink(repo.vfs.join('updatestate'))
 
             if not branchmerge:
                 repo.dirstate.setbranch(p2.branch())