Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook

[Nathaniel Smith]

On Wed, May 25, 2005 at 12:33:04AM +0200, rghetta wrote:
> If the hook returns nil, the file will be treated as binary if the 
> monotone function guess_binary() returns true, i.e. if the files 
> contains NUL bytes or a selection of other ASCII control chars (for 
> example, STX and ETX).

Another possible way to do binary support, for discussion:
  -- have the merger peek at .mt-attrs, and if a "binary" attribute is
     set on a file, consider it binary.  (Currently nothing in .mt-attrs
     has hard-coded behavior, so this would be a change.)
  -- use the cool new attr_init hooks to automatically guess at "add"
     time whether each file is binary.
  -- never again automatically touch this attribute; let people set it
     to what they want, if they want

Another possible way to do binary support, for discussion:
  -- just use guess_binary() on the data at merge time

I don't tend to store binary files under VCS, so I don't have as much
of an intuition about what the nicest way to do so would be; it'd be
good to hear opinions from those actually affected by this :-)

-- Nathaniel

-- 
  /* Tell the world that we're going to be the grim
   * reaper of innocent orphaned children.
   */
-- Linux kernel 2.4.5, main.c

This email may be read aloud.