Force merge tool to run on any change
Andrew Lentvorski
bsder at allcaps.org
Thu Oct 22 18:37:27 UTC 2015
On 10/22/15, 5:08 AM, Matt Mackall wrote:
> On Thu, 2015-10-22 at 10:26 +0100, Pierre-Yves David wrote:
>> Premerge happens in all case no matter what. The 'premerge' config
>> for
>> tool only control if the premerge result should be kept.
>
> This is incorrect:
>
> https://selenic.com/hg/file/tip/mercurial/filemerge.py#l214
>
> If premerge is false, we'll skip it entirely. However:
>
> a) we'll never invoke a merge tool if there's a change on only one
> branch, we'll simply take the changed version
>
> b) kdiff3 has its own premerge that we turn on:
>
> --auto No GUI if all conflicts are auto-solvable. (Needs -o file)
Right, which is why I had to add the kdiff3.args to my config to prevent
that.
However, the real issue is that merge simply never runs in my case since
the changes are localized to only one branch (either A or B but never
the same file).
Judging by the information floating around (Googling this pulls up a lot
of misconceptions, as well), my request is not an uncommon one.
I merged and committed my stuff by hand since I only had 4 files that I
had to deal with. But, if I had a bunch of files, this would have been
painful.
Should I open up a bug report? It sounds like people know about this
and are working on it, though.
Thanks,
-a
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20151022/7c07e067/attachment.asc>
More information about the Mercurial
mailing list