Message8461

Author shap
Recipients djc, kiilerix, mpm, nbecker, pmezard, tonfa
Date 2009-01-21.16:53:48
Content
This is on FC8. The RPM version is 1.1-1. Output of hg debugconfig (eliding
email addresses). Note this is output of debugconfig when my workaround is
commented out.

The problem is not that mergetools.rc is searching for all tools on all
platforms. The problem is that it is getting a completely borked answer. The
symptom is that running hg fetch (when a merge happens), hg merge, or hg resolve
**fails** with a complaint that the filemerge tool (actually, it gives the full
path shown below) cannot be found.

It is the total fail of merge that makes this one urgent to critical in my mind.


bundle.mainreporoot=/home/shap/HG/bitc-methods
email.from=Jonathan S. Shapiro <>
email.method=/usr/sbin/sendmail
extensions.hgext.fetch=
extensions.hgext.gpg=
extensions.hgext.patchbomb=
merge-tools.diffmerge.args=--nosplash --merge --title1=base --title2=local
--title3=other $base $local $other
merge-tools.diffmerge.checkchanged=True
merge-tools.diffmerge.gui=True
merge-tools.ecmerge.args=$base $local $other --mode=merge3 --title0=base
--title1=local --title2=other --to=$output
merge-tools.ecmerge.gui=True
merge-tools.ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
merge-tools.filemerge.args=-left $other -right $local -ancestor $base -merge $output
merge-tools.filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
merge-tools.filemerge.gui=True
merge-tools.gpyfm.gui=True
merge-tools.gvimdiff.args=--nofork -d -g -O $local $other $base
merge-tools.gvimdiff.priority=-9
merge-tools.gvimdiff.regkey=Software\Vim\GVim
merge-tools.gvimdiff.regname=path
merge-tools.kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local
$other -o $output
merge-tools.kdiff3.fixeol=True
merge-tools.kdiff3.gui=True
merge-tools.kdiff3.regappend=\kdiff3.exe
merge-tools.kdiff3.regkey=Software\KDiff3
merge-tools.meld.gui=True
merge-tools.merge.checkconflicts=True
merge-tools.merge.priority=-10
merge-tools.p4merge.args=$base $local $other $output
merge-tools.p4merge.gui=True
merge-tools.p4merge.priority=-8
merge-tools.p4merge.regappend=\p4merge.exe
merge-tools.p4merge.regkey=Software\Perforce\Environment
merge-tools.p4merge.regname=P4INSTROOT
merge-tools.tkdiff.args=$local $other -a $base -o $output
merge-tools.tkdiff.gui=True
merge-tools.tkdiff.priority=-8
merge-tools.tortoisemerge.args=/base: $output /mine:$local /theirs:$other
/merged:$output
merge-tools.tortoisemerge.gui=True
merge-tools.tortoisemerge.regkey=Software\TortoiseSVN
merge-tools.xxdiff.args=--show-merged-pane --exit-with-merge-status --title1
local --title2 base --title3 other --merged-filename $output --merge $local
$base $other
merge-tools.xxdiff.gui=True
merge-tools.xxdiff.priority=-8
paths.default=ssh://hg@dev.eros-os.com//srv/hg/repo/bitc
paths.default-push=/dev/null
ui.editor=emacs
ui.username=Jonathan S. Shapiro <>
History
Date User Action Args
2009-01-21 16:53:50shapsetrecipients: + mpm, tonfa, pmezard, kiilerix, nbecker, djc
2009-01-21 16:53:50shapsetmessageid: <1232556830.41.0.962950326904.issue1478@selenic.com>
2009-01-21 16:53:50shaplinkissue1478 messages
2009-01-21 16:53:48shapcreate