How just to intercept merging "conflicts", nothing else

[Giovanni Gherdovich]

[hit `send` too soon, sorry]

Hello,

On Wed, Feb 5, 2014 at 8:40 AM, Pietro Moras <studio-pm at hotmail.com> wrote:
>
> The simplest, more direct way for instructing (i.e.: configuring)
Mercurial
> (I mean: just Mercurial, no other products, nor tools):
>
> - Please just intercept possible source merge "conflicts",
> nothing else, as I intend to take full responsibility of them.

I understand your question like this:

"how to have Mercurial telling what conflicts there *would* be
in merging changeset X and Y, without actually merging anything."

As far as I know, this is (sadly) not possible.
The best you can do as of today is to run `hg merge --tool=internal:merge`,
the parse its output, then restore the files as before with `hg update . -C`

The feature you look for would be enabled if we had "in-memory merges",
which is something I will add to
http://mercurial.selenic.com/wiki/SummerOfCode/Ideas2014

GGhh
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140205/962da97d/attachment-0002.html>