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
--- 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