Mercurial > public > mercurial-scm > hg
comparison mercurial/mergestate.py @ 45159:e05a488cbed0
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 |
comparison
equal
deleted
inserted
replaced
| 45158:ed58ecd59030 | 45159:e05a488cbed0 |
|---|---|
| 538 fcl.flags(), | 538 fcl.flags(), |
| 539 ] | 539 ] |
| 540 self._stateextras[fd] = {b'ancestorlinknode': hex(fca.node())} | 540 self._stateextras[fd] = {b'ancestorlinknode': hex(fca.node())} |
| 541 self._dirty = True | 541 self._dirty = True |
| 542 | 542 |
| 543 def addpath(self, path, frename, forigin): | 543 def addpathconflict(self, path, frename, forigin): |
| 544 """add a new conflicting path to the merge state | 544 """add a new conflicting path to the merge state |
| 545 path: the path that conflicts | 545 path: the path that conflicts |
| 546 frename: the filename the conflicting file was renamed to | 546 frename: the filename the conflicting file was renamed to |
| 547 forigin: origin of the file ('l' or 'r' for local/remote) | 547 forigin: origin of the file ('l' or 'r' for local/remote) |
| 548 """ | 548 """ |