Comments
Patch
@@ -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
@@ -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