Can hit the problem by making the blackbox tests use a non-ascii path like so:
=== modified file 'bzrlib/tests/blackbox/test_conflicts.py' --- bzrlib/tests/blackbox/test_conflicts.py 2010-11-07 16:32:51 +0000 +++ bzrlib/tests/blackbox/test_conflicts.py 2011-04-13 14:05:01 +0000 @@ -43,7 +43,7 @@ ('%s/myfile' % (this_path,), 'contentsa2\n'), ('%s/my_other_file' % (this_path,), 'contentsa2\n'), ]) - this_tree.rename_one('mydir', 'mydir3') + this_tree.rename_one('mydir', u'mydir3\xa0') this_tree.commit(message='change') this_tree.merge_from_branch(other_tree.branch) return this_tree, other_tree
Can hit the problem by making the blackbox tests use a non-ascii path like so:
=== modified file 'bzrlib/ tests/blackbox/ test_conflicts. py' tests/blackbox/ test_conflicts. py 2010-11-07 16:32:51 +0000 tests/blackbox/ test_conflicts. py 2011-04-13 14:05:01 +0000
('%s/ myfile' % (this_path,), 'contentsa2\n'),
('%s/ my_other_ file' % (this_path,), 'contentsa2\n'), rename_ one('mydir' , 'mydir3') rename_ one('mydir' , u'mydir3\xa0') tree.commit( message= 'change' ) tree.merge_ from_branch( other_tree. branch)
--- bzrlib/
+++ bzrlib/
@@ -43,7 +43,7 @@
])
- this_tree.
+ this_tree.
this_
this_
return this_tree, other_tree