[PATCH 3 of 4 V3] update: also suggest --merge when non-linear update is aborted

[Martin von Zweigbergk]

I agree with leaving this patch out until we have a better way of aborting.
I think I put it last in the V4, so it should be easy to skip. Thanks.

On Tue, Feb 21, 2017, 08:07 Augie Fackler <raf at durin42.com> wrote:

>
> > On Feb 20, 2017, at 05:38, Gábor STEFANIK <Gabor.STEFANIK at nng.com>
> wrote:
> >
> >> On Wed, Feb 15, 2017 at 12:56:41PM -0800, Martin von Zweigbergk via
> >> Mercurial-devel wrote:
> >>> # HG changeset patch
> >>> # User Martin von Zweigbergk <martinvonz at google.com> # Date
> >> 1487140898
> >>> 28800
> >>> #      Tue Feb 14 22:41:38 2017 -0800
> >>> # Node ID c6cd58d272aee6633fbad5eacdad742e2f9909cd
> >>> # Parent  542a99ede6c3ac7cb4afccd3703fcc30e3d4c90d
> >>> update: also suggest --merge when non-linear update is aborted
> >>
> >> This makes me a touch nervous, since the merge can leave the user in an
> >> state that's hard to recover from.
> >
> > Basically "hg resolve -au; hg resolve -at:local; hg update --merge
> -r$(head -c40 .hg/merge/state) -t:local"; but we need to expose a less
> hacky way of doing so.
>
> Not quite, because this isn't sure (I don't think) to get you back to
> exactly the pre-update-command state, as some files might have been merged
> behind your back?
>
> >
> > "hg update --abort"?
>
> I'd be a big fan of having an update --abort that just takes you back to
> where you were before the conflicts. To date, nobody has been motivated
> enough to do the work (I'd love to do it, but it's unlikely to be near the
> top of my stack for months/years).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20170221/e5eb4d80/attachment.html>