Comment 9 for bug 135320

Revision history for this message
Matthias Müller-Reineke (matthias-mueller-reineke) wrote : Re: bzr merge - exceptions.UnicodeDecodeError

(The following is copied from the dupplicate of this bug (#189246).)

The "print-debuger" showed that there

File "/usr/local/Python-2.5/lib/python2.5/site-packages/bzrlib/dirstate.py",
in _get_output_line
...
    inventory_text = '\0\n\0'.join(lines)
...

lines contained a mixture of strings and unicode objects. There were strings with utf-8 encoded file names. I discovered the utf-8 code of an german umlaut ('ä') which was part of a name of my files in a simple string.

This insight made me propose the path mentioned above.