[MERGE] Show the diff in the commit messages

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Goffredo Baroncelli wrote:
>> 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!

Perhaps we should make the diff header encoding selectable.

> I think that is more clear a diff with a text wrong instead a diff with the 
> path wrong.

You can have any opinion you like, but munging the characters in a diff
is not acceptable to me.  We only need one way to produce an eight-bit
diff.  Your approach will produce diffs that are not usable as input to
'patch'.

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

Yes.  That should be fixed.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGl7sC0F+nu1YWqI0RAkaGAJ97ZF5SR+CyJkeGZgXyIhu9oCjeXACeIlAX
eHeYI0UYvqKo0MplDwvByqA=
=2CPn
-----END PGP SIGNATURE-----