[MERGE] Show the diff in the commit messages

[Goffredo Baroncelli]

On Thursday 12 July 2007, Aaron Bentley wrote:
> Aaron Bentley has voted -1.
> Status is now: Vetoed
> Comment:
> Causes the diff to be interpreted as utf-8, instead of leaving it as 
> binary.

Yes, because the paths in the diff header are utf8 encoded!
I think that is more clear a diff with a text wrong instead a diff with the 
path wrong. See the two following examples ( I enclose an image if there is 
some problem with the email encoding)

The filename is hellØ (the last char is a O with / : u'\u00d8')

Path good, diff wrong

=== modified file 'hell\xc3\x98'
--- hellØ       2007-07-13 17:01:25 +0000
+++ hellØ       2007-07-13 17:16:42 +0000
@@ -1,1 +1,1 @@
-hello123
+hell�
\ No newline at end of file


Path wrong, diff good

=== modified file 'hell\xc3\x98'
--- hellà      2007-07-13 17:01:25 +0000
+++ hellà      2007-07-13 17:16:42 +0000
@@ -1,1 +1,1 @@
-hello123
+hellØ
\ No newline at end of file


Note that the line "=== modified file 'hell\xc3\x98'" is a bzr bug.

Goffredo
-- 
gpg key@ keyserver.linux.it: Goffredo Baroncelli (ghigo) <kreijack_inwind_it>
Key fingerprint = CE3C 7E01 6782 30A3 5B87  87C0 BB86 505C 6B2A CFF9
-------------- next part --------------
A non-text attachment was scrubbed...
Name: diff.png
Type: image/png
Size: 16798 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070713/96a6756f/attachment.png