How just to intercept merging "conflicts", nothing else

[Simon King]

On Wed, Feb 5, 2014 at 12:44 PM, Giovanni Gherdovich
<g.gherdovich at gmail.com> wrote:
> [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
>

I think the way TortoiseHG does it is to run the merge with
"--tool=internal:fail". For files which require a merge, this leaves
the contents alone but marks them as unresolved.

Simon