# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 2020-07-09 09:14:58
# Node ID e05a488cbed0953a84bb50b7865b6592af99b062
# Parent  ed58ecd5903033991e7fcbf560e83f7478acf08d

mergestate: rename addpath() -> addpathonflict() to prevent confusion

addpath() seems to imply that we are adding a new path/entry to the mergestate.

Differential Revision: https://phab.mercurial-scm.org/D8715

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1264,7 +1264,7 @@ def applyupdates(
         else:
             s(_(b"the remote file has been renamed to %s\n") % f1)
         s(_(b"resolve manually then use 'hg resolve --mark %s'\n") % f)
-        ms.addpath(f, f1, fo)
+        ms.addpathconflict(f, f1, fo)
         progress.increment(item=f)
 
     # When merging in-memory, we can't support worker processes, so set the
diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -540,7 +540,7 @@ class mergestate(object):
         self._stateextras[fd] = {b'ancestorlinknode': hex(fca.node())}
         self._dirty = True
 
-    def addpath(self, path, frename, forigin):
+    def addpathconflict(self, path, frename, forigin):
         """add a new conflicting path to the merge state
         path:    the path that conflicts
         frename: the filename the conflicting file was renamed to