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

[Matt Mackall]

On Thu, 2013-03-28 at 07:48 +0000, Völker Ronny wrote:
> # HG changeset patch
> # User ronvoe12249 <ronny.voelker at elaxy.com>
> # Date 1361454565 -3600
> # Node ID 1873dc48d8ce764436f9b4904dd3c29d2f7ff90a
> # Parent  fabbaa250977ad337a36b1c4cece22da94adfe4b
> mergetools.hgrc meld.args: avoid loosing the merged version
> 
> Rename the center panel to 'merged', to make it clear that this panel will contain
> the merged version (as it is intended by Meld).

Seems like a good idea.

> Add -o $output, to avoid loosing the merged version.
> With the previous configuration, the merged version was written to the wrong
> file ($base, a temporary file, which is ignored by Mercurial).

Seems like a good idea for another patch. One idea per patch, please.
This one ought to be on the stable branch, as it's fixing a bug?

> Add --auto-merge, to enable automatic merging of all non-conflicting changes.

Questionable. How long has the current release been out? If people
install this on their gnarly old RHEL system, are they going to need to
hack their config to work with their gnarly old meld? My guess is yes

Save until the first two get dealt with, please. 

> diff -r fabbaa250977 -r 1873dc48d8ce contrib/mergetools.hgrc
> --- a/contrib/mergetools.hgrc	Sat Feb 09 21:51:21 2013 +0000
> +++ b/contrib/mergetools.hgrc	Thu Feb 21 14:49:25 2013 +0100
> @@ -25,7 +25,9 @@
>  gpyfm.gui=True
>  
>  meld.gui=True
> -meld.args=--label='local' $local --label='base' $base --label='other' $other
> +meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output --auto-merge
> +;The option --auto-merge requires meld 1.7 or younger. For older versions use:
> +;meld.args=--label='local' $local --label='target' $base --label='other' $other -o $output
>  meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
>  
>  tkdiff.args=$local $other -a $base -o $output
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel


-- 
Mathematics is the supreme nostalgia of our time.