Mercurial > hg

changeset 45166:a5be403dd7a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: document what mergestate._results is for Understanding that dict is important for understanding how mergestate is performing operations on dirstate. Differential Revision: https://phab.mercurial-scm.org/D8739
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 09 Jul 2020 18:43:38 +0530
parents 01c4dccfd6b5
children 796b63b0f0dd
files mercurial/mergestate.py
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/mergestate.py	Thu Jul 09 18:38:09 2020 +0530
+++ b/mercurial/mergestate.py	Thu Jul 09 18:43:38 2020 +0530
@@ -267,6 +267,11 @@
                 self._labels = [l for l in labels if len(l) > 0]
             elif not rtype.islower():
                 unsupported.add(rtype)
+        # contains a mapping of form:
+        # {filename : (merge_return_value, action_to_be_performed}
+        # these are results of re-running merge process
+        # this dict is used to perform actions on dirstate caused by re-running
+        # the merge
         self._results = {}
         self._dirty = False