`bzr conflicts` fails when non-ascii char in conflicted file path

[IWATA Hidetaka]

(bzr2.3/2.4)When non-ascii characters are in conflicted file path, 'bzr conflicts' failes with following traceback.
Both bzr2.3.3 and 2.4b2 have this problem.

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 926, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1126, in run_bzr
  File "bzrlib\commands.pyo", line 691, in run_argv_aliases
  File "bzrlib\commands.pyo", line 713, in run
  File "bzrlib\cleanup.pyo", line 135, in run_simple
  File "bzrlib\cleanup.pyo", line 165, in _do_with_cleanups
  File "bzrlib\conflicts.pyo", line 75, in run
UnicodeEncodeError: 'ascii' codec can't encode characters in position 22-23: ordinal not in range(128)

bzr 2.3.3 on python 2.6.6 (Windows-7-6.1.7600)
arguments: ['bzr', 'conflicts']
plugins: bzrtools[2.3.1], colo[0.2.1], explorer[1.1.3], fastimport[0.10.0],
    launchpad[2.3.3], loom[2.2.1dev], netrc_credential_store[2.3.3],
    news_merge[2.3.3], pipeline[1.1.0], qbzr[0.20.1], rewrite[0.6.2dev],
    svn[1.0.5dev], upload[1.0.0], xmloutput[0.8.7.dev]
encoding: 'cp932', fsenc: 'mbcs', lang: 'ja'

[Alexander Belchenko (bialix)]

a guess: no proper encoding style specified for the command?

[Alexander Belchenko (bialix)]

I think qconflicts should work OK with non-ascii paths.

[Martin Packman (gz)]

Good news! Fixed this at the sprint last week, so you shouldn't have the issue with 2.4b3 when it's released.