[PATCH] resolve: add D state to help
mpm at selenic.com
Mon Jul 18 23:54:52 EDT 2016
On Tue, 2016-07-05 at 17:25 -0700, Siddharth Agarwal wrote:
> 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
> experimental/not-fully-supported-in-core stuff.
> (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?)
Yes, but not trivially. We should eventually teach extensions.py how to add help
to wrapped commands in some clean fashion.
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel