hg rollback / hg revert / hg ?? a merge - hg merge could tell it to the user

[anatoly techtonik]

On Sat, Jul 7, 2012 at 11:23 AM, Adrian Buehlmann <adrian at cadifra.com> wrote:
> On 2010-06-26 13:42, rupert THURNER wrote:
>> On Fri, Jun 25, 2010 at 15:55, Mads Kiilerich <mads at kiilerich.com> wrote:
> [...]
>>> A right way to undo a merge is "hg update -C ." [...]
>>
>> i needed aborting a merge 3 times in four years. every single time i
>> tried to look up the command and did not find it again. [...]
>
> Please have a look at http://selenic.com/repo/hg/rev/eac141407b85
>
> which is:
>
> # HG changeset patch
> # User Matt Mackall <mpm at selenic.com>
> # Date 1277678503 18000
> # Node ID eac141407b854b90b81eef4e6e6ecc86f7ab06f1
> # Parent  51021f4c80b5dcf608626ddc24b21c155df2cae8
> merge: document how to 'undo' a merge

...

> That change was committed on 2010-06-28 on Mercurial's stable branch and
> first appeared in Mercurial 1.6, which was released a few days after
> that. So that help text has been there for two years now.
>
> So, you probably must have done your 3 merge aborts with a version of
> Mercurial < 1.6, or you didn't really read 'hg help merge'.
>
> For your reference, the full help text can also be read at:
> http://selenic.com/repo/hg/help/merge

Thanks. But I am running 2.2.2. And if you read my command log once
more you'll see that I haven't even tried to read `hg help merge`.
Most likely because Mercurial misguided me to 'hg update' and 'hg help
revert'. It is still a waste of time two years later.
--
anatoly t.