Mercurial > public > mercurial-scm > hg-stable

diff mercurial/mergestate.py @ 45159:e05a488cbed0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 09 Jul 2020 14:44:58 +0530
parents 818b4f19ef23
children fcd0cff3400a
line wrap: on
line diff
--- a/mercurial/mergestate.py	Sat Jul 18 12:35:55 2020 +0200
+++ b/mercurial/mergestate.py	Thu Jul 09 14:44:58 2020 +0530
@@ -540,7 +540,7 @@
         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