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

login
register
mail settings
Submitter phabricator
Date Oct. 6, 2020, 1:42 p.m.
Message ID <differential-rev-PHID-DREV-2tqwpiosjd53ywbfkjvc-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47385/
State Superseded
Headers show

Comments

phabricator - Oct. 6, 2020, 1:42 p.m.
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION 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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9156

AFFECTED FILES
  mercurial/mergestate.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -160,6 +160,7 @@ 
     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.