[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook
From: |
Emile Snyder |
Subject: |
Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook |
Date: |
Wed, 25 May 2005 23:20:32 -0700 |
I like the idea of an .mt-attrs approach because the binary'ness of a
file is a property of the file, not something that different people
should have different ideas about (a'la hooks).
I don't have particularly strong feelings about the right way to help
monotone automatically figure it out for you, but I do feel strongly
that there should be some way to explicitly tell monotone to treat a
file as binary and have it do the right thing from then on.
thanks,
-emile
On Wed, 2005-05-25 at 21:09 -0700, Nathaniel Smith wrote:
> 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
>
signature.asc
Description: This is a digitally signed message part
- [Monotone-devel] [PATCH] and RFC: binary files merging and hook, rghetta, 2005/05/24
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, Glen Ditchfield, 2005/05/25
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, Nathaniel Smith, 2005/05/26
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, rghetta, 2005/05/27
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, Glen Ditchfield, 2005/05/28
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, Glen Ditchfield, 2005/05/31