mercurial & binary files

[Giorgos Keramidas]

On Mon, 28 Jul 2008 19:22:43 +0200 (CEST), Marko Käning <mk362 at mch.osram.de> wrote:
>> You probably want fail, as it will give you a chance to decide what to
>> do.
>
> I guess I hooked onto a misunderstanding on my side here. You are
> right: I need fail for all my binary files. This gives me the chance
> to check whether the new version is what I want and if so I can just
> accept the file from the update, after manually deleting mine from the
> working copy.
>
> Is there a possibility to set a global pattern in such way that by
> default all files are treated as binary? Additional patterns could
> than be used to define certain allowed file types as mergable...

The [merge-patterns] config section may help with that:

    [merge-patterns]
    **.xls = internal:fail

I'm not sure if the most specific match will be used.  If it was, then
it should be possible to use stuff like:

    [merge-patterns]
    ** = internal:fail
    **.h = kdiff3
    **.c = kdiff3
    special/sources/file.c = internal:merge