Re: [Monotone-devel] Representing EBCDIC history in monotone

[Thomas Keller]

Jack Lloyd schrieb:
> On Tue, Jul 01, 2008 at 05:10:28PM -0400, address@hidden wrote:
> > > Or maybe just mark that file as binary, then delete the manual-merge
> > > cert on it? (Does that even work?)
> > Manual-merge cert?  What is that?
>
> That is me confusing Monotone and Subversion. It's been a long day. :(

Actually there is a mtn:manual-merge _attribute_ in mtn which can be 
attached to a file and which even gets auto-attached for a couple of 
file extensions plus files which contain bytes in the following areas:

     0x00 thru 0x06
     0x0E thru 0x1a
     0x1c thru 0x1f

(see manual section 3.14 for more information)

Files with this attribute attached should be handled as binary files 
during a merge, i.e. the text merger will not try to merge them.

Thomas.

--
GPG-Key 0x160D1092 | address@hidden | http://thomaskeller.biz
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en

signature.asc
Description: OpenPGP digital signature