D8739: mergestate: document what mergestate._results is for
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Tue Jul 14 12:32:21 UTC 2020
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
Understanding that dict is important for understanding how mergestate is
performing operations on dirstate.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8739
AFFECTED FILES
mercurial/mergestate.py
CHANGE DETAILS
diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -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
To: pulkit, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list