BUG: bundle testament: something wrong again

Alexander Belchenko bialix at ukr.net
Tue Jul 11 14:35:41 BST 2006


Matthieu Moy пишет:
> Aaron Bentley <aaron.bentley at utoronto.ca> writes:
>>Alexander Belchenko wrote:
>>>As I understand another solution for this problem (and this was
>>>discussed before, IIRC) is to make diff inside bundle only for review
>>>and store *all* actual revision text inside base-64 encoded section.
>>
>>Yes.  This solution doesn't sit right with me, especially because it
>>would require a binary section even when the bundle only has a single
>>revision.
>>
>>It would also be possible to declare the line-ending type of each patch.
> 
> 
> Indeed, in 99% of cases, the line-ending would be uniform. Perhaps
> "merge" could assume uniform line-endings (it can see it in the base
> revision of the file), and bundle-revisions could generate text-diff
> only for uniform line-ending files, and use base64 for others.

Yes. For most windows users line-endings will uniform. And these
line-endigns will CRLF. And this happens again, because bundle itself
use LF line-endings. So from this point bundle already will contain
mixed line-endings.

I think Aaron idea to store in bundles information about actual
line-endings and in long term future support for differentiate
line-endings in bzr inventory itself will be right solution.

--
Alexander





More information about the bazaar mailing list