This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9156

mergestate: document `o` merge record state in _mergestate_base docs
ClosedPublic

Authored by pulkit on Oct 6 2020, 9:42 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGecf6d7aa874b: mergestate: document `o` merge record state in _mergestate_base docs
Summary

_mergestate_base documentation serves as a nice documentation for mergestate.
This also documents known merge records and known merge record states.

I missed adding o state to it when I introduced it. Let's add it now.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Oct 6 2020, 9:42 AM
pulkit added a commit: rHGecf6d7aa874b: mergestate: document `o` merge record state in _mergestate_base docs.Oct 14 2020, 8:14 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGecf6d7aa874b: mergestate: document `o` merge record state in _mergestate_base docs (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (1 line)

Diff 23201

mercurial/mergestate.py

f: a (filename, dictionary) tuple of optional values for a given file f: a (filename, dictionary) tuple of optional values for a given file
l: the labels for the parts of the merge. l: the labels for the parts of the merge.
Merge record states (stored in self._state, indexed by filename): Merge record states (stored in self._state, indexed by filename):
u: unresolved conflict u: unresolved conflict
r: resolved conflict r: resolved conflict
pu: unresolved path conflict (file conflicts with directory) pu: unresolved path conflict (file conflicts with directory)
pr: resolved path conflict pr: resolved path conflict
o: file was merged in favor of other parent of merge (DEPRECATED)
The resolve command transitions between 'u' and 'r' for conflicts and The resolve command transitions between 'u' and 'r' for conflicts and
'pu' and 'pr' for path conflicts. 'pu' and 'pr' for path conflicts.
''' '''
def __init__(self, repo): def __init__(self, repo):
"""Initialize the merge state. """Initialize the merge state.