Mercurial > hg

view tests/test-gendoc-ro.t @ 45382:0652a533fe3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: use _stateextras instead of merge records for commit related info There is a set of information related to a merge which is needed on commit. We want to store such information in the mergestate so that we can read it while committing. For this purpose, we are using merge records and introduced a merge entry state for that. However this won't scale and is not clean way to implement this. This patch reworks the existing logic related to this to use _stateextras and read from it. Right now the information stored is not very descriptive but it will be in next patch. Using _stateextras also makes MERGE_RECORD_MERGED_OTHER useless and only to be kept for BC. Differential Revision: https://phab.mercurial-scm.org/D8920
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 10 Aug 2020 15:29:02 +0530
parents 8346b2f09e79
children
line wrap: on
line source

#require docutils gettext

Error: the current ro localization has some rst defects exposed by
moving pager to core. These two warnings about references are expected
until the localization is corrected.
  $ $TESTDIR/check-gendoc ro
  checking for parse errors
  gendoc.txt:58: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.
  gendoc.txt:58: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.