[PATCH] Fix meld.args in mergetools.rc: add -o $output

[Angel Ezquerra]

On Fri, Feb 22, 2013 at 9:11 PM, Angel Ezquerra
<angel.ezquerra at gmail.com> wrote:
> On Fri, Feb 22, 2013 at 2:06 PM, Völker Ronny <ronny.voelker at elaxy.de> wrote:
>> Angel Ezquerra <angel.ezquerra at gmail.com> wrote:
>>
>>>I still do not understand why you need to use -o. On my brief tests the current configuration seems to work fine.
>>
>> You deliberately edited the  left pane (local) and saved it, right?
>>
>> I'm merging from the left pane (local) and the right pane (other) into the middle pane (base).
>> The mentioned menu item "Changes->Merge all non-conflicting does exactly" the same (so this way of merging seems to be preferred by Meld).
>> At the end, the content of the middle pane has to be saved.
>> Without -o the middle pane is saved into the underlying file (base). This is a temporary file, created (and later ignored) by Mercurial
>> So my changes are lost after closing Meld.
>> With -o my changes (in the middle pane) are saved into $output, which is the file, mercurial is using as the result of the merge.
>>
>> Ronny
>
> I see. In that case I think you also must change the label of the
> center panel to make it clear that it is the merge panel, not the
> base. When I read base I did not think of editing that panel.
>
> BTW, I don't know if you noticed but we do bottom post on this mailing list.
>
> Cheers,
>
> Angel

Hi,

I brought this thread up on the meld mailing list. I was told by the
developer that an "--auto-merge" flag was introduced in 1.7.0. This
flag asks meld to run the "Merge all non-conflicting" changes.

The problem is that on earlier versions of Meld the flag did not
exist. The Meld lead dev said that instead "you could start it by
passing four file arguments instead (<left, ancestor, right, out> if I
remember correctly), but that's not supported anymore."

So the problem is that we would need to use two different sets of
command line parameters depending on the version of meld.

Also, he mentioned that his preference would be to do:

"$local $output $base" with "premerge = True" on the mercurial config
side (and the appropriate --label parameters of course). He said that
in that case using the "--auto-merge" flag would be unnecessary. The
only drawback is that you lose ancestor information, but in his
opinion it is a good trade off.

Cheers,

Angel