[PATCH] Fix meld.args in mergetools.rc: add -o $output
ronny.voelker at elaxy.de
Fri Feb 22 04:19:32 CST 2013
Angel Ezquerra <angel.ezquerra at gmail.com> wrote:
>I just tried using meld (on windows) with TortoiseHg, using the
>current meld configuration (i.e. without your patch). As far as I can
>tell it seems to work fine. The only slightly weird thing is that you
>must make (and save) your changes on the "local" panel.
>So is this really necessary? Probably I'm missing something...
>What I really don't like is the fact that the order of the diff panels
>that meld shows is:
>local - base - other
>This makes it _very_ hard to tell the difference between local and
>other. It would be nice if it could be turned around (i.e.
>base-local-other). Or better yet, it would be nice if Meld could do a
>proper "3-way merge" (with 4 panels) as KDiff3 does.
Steve Borho <steve at borho.org> wrote:
>The Meld model is a lot closer to Araxis Merge than to KDiff3.
I agree with Steve. It looks closer to Araxis Merge, where the middle pane contains the base version and is at the same time the target of merge operations.
The 'Merge mode'-example on http://meldmerge.org/features.html supports this view.
>The way I would prefer for it to work would be for the center pane to be named "merged" and for the trivial changes from both local and other to be pre-applied to the >merge pane. As it is you have to do the trivial merges manually.
I'm using Meld 1.5.3 on Ubuntu12.04. It has a menu item Changes->Merge all non-conflicting, which does what you want. I found no way to trigger this behavior automatically at startup. Maybe the latest version has an option to do this.
Renaming the middle pane may be a good idea, but I think it should be consistent across all merge tools with the same model.
Maybe the order of the panes should be consistent too (the order for Meld is local-base-other, the order for Araxis Merge is other-base-local ).
Anyway, I think that's another change.
More information about the Mercurial-devel