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

[Pierre-Yves David]

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

> 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.

This patch improves stuff that need to be improved too.

+1 for it

-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130328/ed33c3b6/attachment.pgp>