Re: delta question

Georg Nikodym <[email protected]> Wed, 14 Sep 2005 15:24:00 -0400
Newsgroups gmane.comp.version-control.bitkeeper.user
Message-ID <[email protected]>
On Sep 14, 2005, at 14:53, Rick Smith wrote:

> 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.

I'll give this a try.

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

The diff was computed with bk treediff in the first place and diff  
did not
think that the file was binary.

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

So after trying the above and failing, closer examination reveals  
that ld.info in
the binutils package has exactly two NULLs...

Sigh.  Looks like it's time for some hand editing.

Thanks,
-g

_______________________________________________
Bitkeeper-users mailing list
[email protected]
http://mail.bitmover.com/mailman/listinfo/bitkeeper-users
PGP.sig (application/pgp-signature, 186 B) - not displayed