Merge lp:~hid-iwata/bzr-svn/fix-795994 into lp:bzr-svn/1.1

[IWATA Hidetaka]

test and fix for #795994

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

Thanks! Nice work.

=== modified file 'commit.py'
--- commit.py	2011-07-22 21:53:07 +0000
+++ commit.py	2011-08-02 19:36:36 +0000
@@ -365,7 +365,7 @@
             child_base = (base_tree, base_url, base_revnum)
         # open if they existed at the same location and
         # the directory was touched
-        elif new_child_path in visit_dirs:
+        elif new_child_path.decode('utf-8') in visit_dirs:
             trace.mutter('open dir %r', new_child_path)
 
             child_editor = dir_editor.open_directory(
 
=== modified file 'tests/test_commit.py'
--- tests/test_commit.py	2011-07-30 12:52:04 +0000
+++ tests/test_commit.py	2011-08-02 19:36:36 +0000
@@ -374,6 +374,22 @@
         self.assertEqual(2, result.old_revno)
         self.assertEquals(3, result.new_revno)
 
+    def test_add_file_to_unicode_folder(self):
+        self.requireFeature(UnicodeFilenameFeature)
+        self.build_tree({u'dc/I²C/': None})
+        wt = self.newdir.open_workingtree()
+        wt.add(u'I²C')
+        wt.commit(message="Commit from Bzr")
+        self.build_tree({u'dc/I²C/file': 'data'})
+        wt.add(u'I²C/file')
+        wt.commit(message="Commit from Bzr2")
+        result = self.olddir.open_branch().pull(self.newdir.open_branch())
+        self.assertEquals(2, result.old_revno)
+        self.assertEquals(4, result.new_revno)
+        owt = self.olddir.open_workingtree()
+        owt.update()
+        self.assertTrue(owt.has_filename(u'I²C/file'))
+
     def test_rename_from_unicode_filename(self):
         self.requireFeature(UnicodeFilenameFeature)
         self.build_tree({u'dc/I²C': 'other data'})
@@ -802,3 +818,4 @@
         editor = SendPropChangesTests.RecordingFileEditor()
         file_editor_send_prop_changes(ie1, ie2, editor)
         self.assertEquals(editor._props, {})
+