[MERGE] UTF-8 encoding in binary diffs

Jonathan Lange jml at mumak.net
Wed Jul 18 03:12:53 BST 2007


On 7/13/07, Martin Pool <mbp at canonical.com> wrote:
> Martin Pool has voted -1.
> Status is now: Vetoed
> Comment:
> I think changing to %s rather than %r is definitely right.
>
> And I think encoding just the filename, rather than the whole stream, is
> also probably right, as it will give better results if we don't know the
> encoding of the contents of the file.
>
> UPDATE: Not mergeable in its current form because it breaks when the
> test case can't create unicode filenames - jml, could you please fix
> that as described on the list?

Fixed.

I added the Feature to test_diff, as it seems that most Features are
defined in the tests modules in which they are used. To me, it seems
better to have a central bzrlib.tests.features module.

jml
-------------- next part --------------
A non-text attachment was scrubbed...
Name: show-diff-trees-110092.diff
Type: text/x-diff
Size: 21923 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070718/8677ccea/attachment-0001.bin 


More information about the bazaar mailing list