Mercurial with big binary files

[Marko Käning]

Hi Craig,

perhaps the following links to merge tools help you:

---

Date: Mon, 28 Jul 2008 09:15:59 -0400
From: Douglas Philips <dgou at mac.com>
To: Marko Käning <mk362 at mch.osram.de>
Subject: Re: mercurial & binary files

On or about 2008 Jul 28, at 9:02 AM, Marko Käning inquired:
> Is there a way to tell hg that a certain file has to be treated as an
> unmergable binary?

You might want to configure merge-patterns in your .ini:
http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration
http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram

--Doug

---

You should probably read that whole old thread, since there was also a 
post from Matt explaining

---

internal:merge - try to do a normal three-way if files appear to be text
internal:fail - fail
internal:local - preserve the local copy
internal:other - take the remote copy, losing any local changes

You probably want fail, as it will give you a chance to decide what to
do.

---

Hope this helps,
Marko