[PATCH] resolve: add D state to help
sid at less-broken.com
Tue Jul 5 20:25:19 EDT 2016
On 7/4/16 11:46, Ryan McElroy wrote:
> # HG changeset patch
> # User Ryan McElroy <rmcelroy at fb.com>
> # Date 1467655196 25200
> # Mon Jul 04 10:59:56 2016 -0700
> # Node ID 0a056778dfeba44b761ba77c47d4f0521690ab41
> # Parent fd93b15b5c30d16fd9c9eba61402d07fc4085db3
> resolve: add D state to help
> The 'D' (resolved by merge driver) state was not mentioned in the help but
> it can show up in output that users see, so we should document it.
Hmm, so I didn't add it to the docs because this is
(1) Add this information to the help text but mark it experimental (how?).
(2) Add this information to the help text in the mergedriver.py
extension (is this possible?)
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -6112,7 +6112,8 @@ def resolve(ui, repo, *pats, **opts):
> default is to mark all resolved files.
> - :hg:`resolve -l`: list files which had or still have conflicts.
> - In the printed list, ``U`` = unresolved and ``R`` = resolved.
> + In the printed list, ``U`` = unresolved, ``R`` = resolved, and
> + ``D`` = resolved by the merge driver (see :hg:`help merge-tools`).
This doesn't have any text about the mergedriver yet.
> .. note::
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
More information about the Mercurial-devel