Patchwork Fix meld.args in mergetools.rc: add -o $output (1/3)

login
register
mail settings
Submitter Völker Ronny
Date April 16, 2013, 12:29 p.m.
Message ID <679C86927552B447B2A1522BFC65B7E33BB6132F@srv-cob-vm-0059.elaxy.org>
Download mbox | patch
Permalink /patch/1344/
State Superseded, archived
Commit 9bfa86746c9c1f6ab51deb8f174ffc482417d09f
Headers show

Comments

Völker Ronny - April 16, 2013, 12:29 p.m.
# HG changeset patch
# User ronvoe12249 <ronny.voelker@elaxy.com>
# Date 1361454565 -3600
# Node ID 5fb773727e953740e66f5b2c69739db7136549d8
# Parent  257afe5489d4a6ebca6a9e13bba1b69a9289b89d
mergetools.hgrc meld.args: avoid loosing the merged version

Add -o $output.
When using Meld as intended (merge from left and right into the center panel),
the merged version is written to the wrong file without this option ($base,
a temporary file, which is ignored by Mercurial).

Add meld.check=changed as a secondary safety net.

Patch

diff -r 257afe5489d4 -r 5fb773727e95 contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Wed Apr 10 02:27:35 2013 +0900
+++ b/contrib/mergetools.hgrc	Thu Feb 21 14:49:25 2013 +0100
@@ -25,7 +25,8 @@ 
 gpyfm.gui=True
 
 meld.gui=True
-meld.args=--label='local' $local --label='base' $base --label='other' $other
+meld.args=--label='local' $local --label='base' $base --label='other' $other -o $output
+meld.check=changed
 meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
 
 tkdiff.args=$local $other -a $base -o $output