merge-patterns not configured correctly

[bmahf]

New at working with mercurial configuration, so please bear with me.  I need
to have mercurial call a program that I have written when it comes upon any
files with the name format of *.db.  I looked on the internet and then wrote
about my situation, and was told that I needed to put the following lines in
my mercurial.ini file:

---------------start ini----------------------

[merge-patterns]
**.db=DatabaseMergeTool

Now my ini file looks like this:

[hooks]
precommit.username = 

[format]
usestore = False

[extdiff]
cmd.kdiff3 = 

[merge-tools]
kdiff3.args = --L1 Parent --L2 Local --L3 Other $base $local $other -o
$output
DatabaseMergeTool.args=--nodialog --replacefiles $base $local $other $output
#DatabaseMergeTool.executable=C:\Program Files\TSE\Database Merge
Tool\dbmergetool
DatabaseMergeTool.executable=C:\IWARS\2.0\work_branch3\Source\DatabaseMergeTool
Project\DatabaseMergeTool\bin\Debug\DatabaseMergeTool.exe

[extensions]
hgext.extdiff =

[tortoisehg]
vdiff = kdiff3

[merge-patterns]
**.db=DatabaseMergeTool

---------------end ini----------------------

What's weird is that I now have mercurial calling my tool for all merges,
whether text or binary.  I looked around some more and then added the
following line to the merge-patterns section thinking that would give a
default, non-db, case:

**=kdiff3

But what ended up happening there was that db files were sent raw into
kdiff3 for merging, so you could see garbled text in the panels for the
three-way merge.  I have no idea why this is happening or what I need to do
to fix this.  Can someone give me a hint as to my next steps?

Thanks for any help you can give...
Bruce


-- 
View this message in context: http://www.nabble.com/merge-patterns-not-configured-correctly-tp23895075p23895075.html
Sent from the Mercurial mailing list archive at Nabble.com.