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

[Völker Ronny]

Angel Ezquerra wrote:
> On Mon, Apr 1, 2013 at 8:44 PM, Matt Mackall <mpm at selenic.com> wrote:
> > 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.
> 
> What will be the best way to deal with this? Perhaps add a new meld17
> config?
> 
> Also, what do you think of enabling premerge for meld?
> 
> Cheers,
> 
> Angel

Premerge is enabled. I already wrote about this topic:
> Btw. while reading  http://mercurial.selenic.com/wiki/MergeToolConfiguration I found, that premerge is enabled by default, but won't help us with our problem.
> The option states,  that mercurial will try a merge on its own and only open the merge tool when it's encountering a conflict.
> When it encounters a conflict and opens the merge tool, then it serves all files unchanged. Non-conflicting changes are *not* automatically merged by mercurial.
> So at the end you have to merge everything manually.

Ronny