Re: delta question

Rick Smith <[email protected]> Wed, 14 Sep 2005 11:53:27 -0700
Newsgroups gmane.comp.version-control.bitkeeper.user
Message-ID <[email protected]>
On Wed, Sep 14, 2005 at 02:35:58PM -0400, Georg Nikodym wrote:
> I'm importing a patch that touches some .info files and for the first  
> time I'm seeing the following:
> 
>     ld/SCCS/s.ld.info: file format is ascii, delta is binary.   
> Unsupported operation.
> 
> The only thing binary about info files is that they use a 0x1f byte  
> (ASCII US) as a page separator.
> 
> Is there an option to delta to force things?

the -D<file> option uses your diff that is there instead of bk computing
the diff.  You should be able to use 'diff -an' or 'diff -a' to compute
the file.

A way to test it is if you don't use the -a and see "Binary files ..."
as the output.

Note: if you have any nulls in the file, then there is no overriding.
BK will always see it as a binary file.

-- Rick