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

login
register
mail settings
Submitter Pulkit Goyal
Date Oct. 13, 2020, 7:35 a.m.
Message ID <8af18289942a8e747ff7.1602574502@workspace>
Download mbox | patch
Permalink /patch/47442/
State Superseded
Headers show

Comments

Pulkit Goyal - Oct. 13, 2020, 7:35 a.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1601991694 -19800
#      Tue Oct 06 19:11:34 2020 +0530
# Node ID 8af18289942a8e747ff76e28e80f3c9e2b437f18
# Parent  d1759b2e18889eb2f58e9d348f45d76af047ba08
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
Yuya Nishihara - Oct. 13, 2020, 10:57 a.m.
On Tue, 13 Oct 2020 13:05:02 +0530, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit@gmail.com>
> # Date 1601991694 -19800
> #      Tue Oct 06 19:11:34 2020 +0530
> # Node ID 8af18289942a8e747ff76e28e80f3c9e2b437f18
> # Parent  d1759b2e18889eb2f58e9d348f45d76af047ba08
> 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

Maybe better to say it is " (deprecated)"?

Patch

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
 
     The resolve command transitions between 'u' and 'r' for conflicts and
     'pu' and 'pr' for path conflicts.