Augie Fackler a écrit :
On Wed, Feb 15, 2017 at 12:56:41PM -0800, Martin von Zweigbergk via
Mercurial-devel wrote:
# HG changeset patch
# User Martin von Zweigbergk <martinv...@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.
Couldn't we instead point the user to "shelve" their changes? (I seem to
recall that suggesting a command from an extension is not "usual" in a
core command, but, in this very case, it looks like the most sensible
thing to do IMHO).
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
