[MERGE] Make annotate behave in a non-ASCII world

[Adeodato Simó]

Hello.

I run `bzr annotate` the other day, and got an UnicodeDecodeError
exception. I digged up a bit and found the cause, and on IRC John
suggested the "write anno separately" trick. I extended that for another
equally-not-likely scenario, and made a test.

I think this, or some other solution, is a must have, even if everybody
prefers gannotate these days. ;-)

Cheers,

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
— George, they're missing.
— Splendid, splendid.
                -- Mrs and Mr Banks in “Mary Poppins”
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr.annotate_fixes.diff
Type: text/x-diff
Size: 3858 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070706/8aed8f0b/attachment.bin