Comment 17 for bug 135320

Revision history for this message
John A Meinel (jameinel) wrote : Re: bzr merge - exceptions.UnicodeDecodeError

You might try a patch like this:
=== modified file 'bzrlib/dirstate.py'
--- bzrlib/dirstate.py 2008-03-06 18:21:43 +0000
+++ bzrlib/dirstate.py 2008-04-25 15:13:52 +0000
@@ -1585,6 +1585,11 @@
         lines.append(self._get_ghosts_line(self._ghosts))
         # append the root line which is special cased
         lines.extend(map(self._entry_to_line, self._iter_entries()))
+ for line in lines:
+ if isinstance(line, unicode):
+ import pdb; pdb.set_trace()
+ raise ValueError('nothing in "lines" should be unicode'
+ ': %r' % (line,))
         return self._get_output_lines(lines)

     def _get_ghosts_line(self, ghost_ids):

If it encounters a unicode string, it should drop you into the python debugger, at that point, if you can just give me the output of:

(pdb) pp line

It might be enough for me to track this down.