[PATCH] merge: output the complete options in the guidance text, not only the often used. Change it as well in the test case outputs.

Martin Geisler mg at lazybytes.net
Mon Jun 28 11:09:14 CDT 2010


We even have a verbose mode for the help - see "hg help add" for our one and
only example.

On Jun 28, 2010 2:32 PM, "Mads Kiilerich" <mads at kiilerich.com> wrote:

On 06/27/2010 07:05 PM, Matt Mackall wrote:
>
> On Sat, 2010-06-26 at 13:33 +0200, rupert THURNER wr...
Perhaps we should add something with "and forget the second/merged parent".

The story of working directory parents vs content is technical and
apparently hard to get right, but it is important in order to understand the
difference between revert, debugsetparents and update --clean.

The trailing "." is easy to miss. Perhaps it should be mentioned explicitly,
now when we are in the verbose friendly mode.

/Mads


_______________________________________________
Mercurial-devel mailing list
Mercurial-devel at seleni...
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100628/6cab4e6e/attachment.htm>


More information about the Mercurial-devel mailing list