merge-patterns not configured correctly

[Mads Kiilerich]

bmahf wrote, On 06/05/2009 10:32 PM:
> [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?
>    

What hg version?

What do "hg debugconfig" say? (Or even better: "hg debugconfig|grep merge")

You shouldn't use merge-pattern ** for the default merge tool. Instead 
the merge-tools priorities should be set so that kdiff3 is found before 
your custom merge tool.

/Mads

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3435 bytes
Desc: S/MIME Cryptographic Signature
Url : http://selenic.com/pipermail/mercurial/attachments/20090606/cfdeab07/attachment.bin