Skip to content
Snippets Groups Projects
Commit a5be403d authored by Pulkit Goyal's avatar Pulkit Goyal
Browse files

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
parent 01c4dccf
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment