[PATCH] Fix meld.args in mergetools.rc: add -o $output
Angel Ezquerra
angel.ezquerra at gmail.com
Thu Mar 28 11:41:02 CDT 2013
On Thu, Mar 28, 2013 at 5:34 PM, Pierre-Yves David
<pierre-yves.david at logilab.fr> wrote:
> On Thu, Mar 28, 2013 at 05:05:54PM +0100, Angel Ezquerra wrote:
>> Also, TortoiseHg (and I guess mercurial would be the same) believes
>> that the merge was successful even if you do not save the output file.
>> I don't know if there is a way to fix that on the meld side? Otherwise
>> I think we should configure mercurial to ask the user if the merge was
>> successful when meld is closed if the file did not change:
>>
>> meld.checkchanged=True
>
> That's a very serious issue
This is not something that has been introduced by this patch. This
problem already happened before (I just checked). Note that this may
be windows specific.
Volker's patch is an improvement over the current behavior. On windows
setting checkchanged to True would improve things, but then that would
not be necessary on linux. I don't know the best way to handled that.
Angel
More information about the Mercurial-devel
mailing list