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

login
register
mail settings
Submitter Pulkit Goyal
Date Oct. 14, 2020, 8:10 a.m.
Message ID <c3ffbf50856b954e3a8b.1602663043@workspace>
Download mbox | patch
Permalink /patch/47453/
State Accepted
Headers show

Comments

Pulkit Goyal - Oct. 14, 2020, 8:10 a.m.
# 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
Yuya Nishihara - Oct. 14, 2020, 10:50 a.m.
On Wed, 14 Oct 2020 13:40:43 +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 c3ffbf50856b954e3a8be968b9a93000b03b1843
> # Parent  04de8a1ec08f380fda794dda3b3f2ed1ccfd442b
> mergestate: document `o` merge record state in _mergestate_base docs

Queued, thanks.

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