From patchwork Wed Oct 14 08:10:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V2] mergestate: document `o` merge record state in _mergestate_base docs From: Pulkit Goyal <7895pulkit@gmail.com> X-Patchwork-Id: 47453 Message-Id: To: mercurial-devel@mercurial-scm.org Date: Wed, 14 Oct 2020 13:40:43 +0530 # HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1601991694 -19800 # Tue Oct 06 19:11:34 2020 +0530 # Node ID c3ffbf50856b954e3a8be968b9a93000b03b1843 # Parent 04de8a1ec08f380fda794dda3b3f2ed1ccfd442b mergestate: document `o` merge record state in _mergestate_base docs _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. Differential Revision: https://phab.mercurial-scm.org/D9156 diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py --- a/mercurial/mergestate.py +++ b/mercurial/mergestate.py @@ -160,6 +160,7 @@ class _mergestate_base(object): r: resolved conflict pu: unresolved path conflict (file conflicts with directory) 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 'pu' and 'pr' for path conflicts.