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

[Pierre-Yves David]

On Thu, Mar 21, 2013 at 12:21:57PM +0000, Völker Ronny wrote:
> 
> There were three separate issues discussed in this Thread:

Awesome! thanks a lot for writing this summary version

> 1. The current configuration for meld is not clear and orders the panels in a way, which is different to that what Meld (and other merge tools of the same kind) seems to prefer (merge from left and right into the center panel).
> This is the sole issue my patch should solve, because with the current configuration I lost code changes after rebasing.
> The panel names are copied from the configuration for Araxis Merge (which has the same merging model).
> Still, one can argue that from the labeling of the panels it's not obvious which is the target panel.
> Angel proposed to rename the center panel from 'base' to 'merged', which would be ok for me.

We need to make it clear were the result of the merge is. This should be a top priority patches.

> 2. In the discussion was raised the issue, that meld isn't configured to automatically merge on startup.
> The latest version of Meld has a command line option to merge on startup, but older versions are lacking that option.
> As a workaround the Meld-dev proposed a configuration, where mercurials automerge is used, with the drawback, that the information
> about the base version is lost.  I think the base version is valuable and we should go without automerge on startup for now.
>  Manually triggering the automatic merging after startup is only one click away.

We do not automatically install the sample configuration tools. Its is packager
jobs to do so. We just need to highlight this change and they take care of
removing automerge if the distribution have a too old version of meld. Anyway
It will probably not be too much touble, the (almost) latest Debian stable have
the latest meld.

> 3. While skimming over the configuration of the other merge tools, I found
> that the naming of the panels is not consistent across merge tools with the
> same merging model.
> E.g. for some the center panel is 'base', for some it is 'merged'. 
> I would expect that, when I use different merge tools of the same kind, the panels are named the same.
> But this is too a minor issue for me.

We should probably unify that. Nice catch.

-- 
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/20130321/40a82614/attachment.pgp>