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

Angel Ezquerra angel.ezquerra at gmail.com
Wed Apr 3 16:36:47 CDT 2013


On Fri, Mar 29, 2013 at 10:52 AM, Pierre-Yves David
<pierre-yves.david at logilab.fr> wrote:
> On Thu, Mar 28, 2013 at 08:14:31PM +0100, Angel Ezquerra wrote:
>> On Thu, Mar 28, 2013 at 5:52 PM, Pierre-Yves David
>> <pierre-yves.david at logilab.fr> wrote:
>> > On Thu, Mar 28, 2013 at 05:41:02PM +0100, Angel Ezquerra wrote:
>> >> 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.
>> >
>> > I'm aware of that, just highlighting the seriousness of this issue on a general basis
>>
>> What do you think is the best way to handle the different behavior
>> between Windows and the other platforms?
>
> Wait, what ? You said that it *may* be windows specific did you confirmed it in the mean time?
> I would assume that all plateform are affected.
>
> --
> Pierre-Yves David

Actually it turns out that I was wrong. This is _not_ windows
specific. Apparently meld does never change its exit code (it is
always zero). I'm trying to convince the meld dev that the correct
behavior is to return 0 only if the output panel was saved, but for
now I believe that we really need to set the checkchanged setting to
True.

Cheers,

Angel


More information about the Mercurial-devel mailing list