Patchwork [1,of,2] contrib: remove mergetools.hgrc premerge=False for Beyond Compare and Araxis

login
register
mail settings
Submitter Mads Kiilerich
Date April 17, 2014, 1:51 p.m.
Message ID <c0c725c599f60c7d17e9.1397742719@localhost.localdomain>
Download mbox | patch
Permalink /patch/4393/
State Accepted
Commit 12c7cea6235cb0de25d0f89fe4daa8d9065bbea1
Headers show

Comments

Mads Kiilerich - April 17, 2014, 1:51 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1397739286 -7200
#      Thu Apr 17 14:54:46 2014 +0200
# Node ID c0c725c599f60c7d17e943e25626990b3523836b
# Parent  19ee4923a2b68744b7a6812e4d7a4e6140343d8d
contrib: remove mergetools.hgrc premerge=False for Beyond Compare and Araxis

There can be good reasons to disable premerge no matter which merge tool is
used. Most tools will do just fine without premerge and handle the simple
merges more or less automatic and silent. We _could_ thus disable premerge for
most tools. But without premerge, the merge tool will be launched for each file
- that makes it a slow and expensive process to perform big simple merges. It
  is thus better to consistently stick to the default premerge=True.

The mergetools.hgrc configuration for most tools implicitly use the default
premerge=True but Araxis and the Linux entry for Beyond Compare had
premerge=False. These lines has been removed.

These settings were introduced by 6b354a763617 without further explanation of
why they should be good.

(We have seen some crashes on Windows with Araxis where a merge failed after a
lot of Araxis flashing. I haven't been able to reproduce it and do not know
exactly what happened. Enabling premerge avoids the problems.)

Patch

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -85,7 +85,6 @@  beyondcompare3.diffargs=/lro /lefttitle=
 
 ; Linux version of Beyond Compare
 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
-bcompare.premerge=False
 bcompare.gui=True
 bcompare.priority=-1
 bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child
@@ -103,7 +102,6 @@  araxis.regkey=SOFTWARE\Classes\TypeLib\{
 araxis.regappend=\ConsoleCompare.exe
 araxis.priority=-2
 araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
-araxis.premerge=False
 araxis.checkconflict=True
 araxis.binary=True
 araxis.gui=True