[issue1126] Traceback on merge file names have national characters (Windows)

[TON]

New submission from TON <olegt at newmail.ru>:

Attached is a bundle of a repository where files have Russian characters in 
their names. When 'hg merge' is run the following output is produced:

C:\My documents\Misc\mgtest\tt>hg --debug merge
filtering файл through
resolving manifests
 overwrite None partial False
 ancestor 76c54cce107f local 615489c97073+ remote b8adfde309a2
  searching for copies back to rev 3
  unmatched files in local:
   TestRepo
   файл.orig
 файл: versions differ -> m
preserving файл for resolve of файл
filtering файл through
filtering файл through
filtering файл through
filtering файл through
picked tool 'kdiff3' for файл (binary False symlink False)
filtering файл through
filtering файл through
merging файл
my файл@615489c97073+ other файл@b8adfde309a2 ancestor файл@76c54cce107f
** unknown exception encountered, details follow
** report bug details to http://www.selenic.com/mercurial/bts
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 6c484adce1c9+tortoisehg)
Traceback (most recent call last):
  File "hg", line 42, in <module>
  File "mercurial\dispatch.pyc", line 20, in run
  File "mercurial\dispatch.pyc", line 29, in dispatch
  File "mercurial\dispatch.pyc", line 45, in _runcatch
  File "mercurial\dispatch.pyc", line 364, in _dispatch
  File "mercurial\dispatch.pyc", line 417, in _runcommand
  File "mercurial\dispatch.pyc", line 373, in checkargs
  File "mercurial\dispatch.pyc", line 356, in <lambda>
  File "mercurial\commands.pyc", line 1905, in merge
  File "mercurial\hg.pyc", line 288, in merge
  File "mercurial\merge.pyc", line 474, in update
  File "mercurial\merge.pyc", line 308, in applyupdates
  File "mercurial\merge.pyc", line 68, in resolve
  File "mercurial\filemerge.pyc", line 196, in filemerge
UnicodeDecodeError: 'ascii' codec can't decode byte 0xf4 in position 48: ordinal
 not in range(128)

I believe this should be reproducible with any national character files. I 
could not reproduce this under Linux since all Linux boxes I have access to 
have English installed.

----------
files: TestRepo
messages: 6047
nosy: TON
priority: bug
status: unread
title: Traceback on merge file names have national characters (Windows)

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1126>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: TestRepo
Type: application/octet-stream
Size: 1411 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20080520/8aa27b3b/attachment-0002.obj>