bzr bug 185211

=== modified file 'bzrlib/dirstate.py'
--- bzrlib/dirstate.py	2011-09-28 16:50:40 +0000
+++ bzrlib/dirstate.py	2011-12-19 13:00:09 +0000
@@ -1559,16 +1559,21 @@
                     else:
                         source_path = child_basename
                     if new_path_utf8:
-                        target_path = new_path_utf8 + source_path[len(old_path):]
+                        target_path_utf8 = new_path_utf8 \
+                                      + source_path[len(old_path_utf8):]
                     else:
-                        if old_path == '':
+                        if old_path_utf8 == '':
                             raise AssertionError("cannot rename directory to"
                                                  " itself")
-                        target_path = source_path[len(old_path) + 1:]
-                    adds.append((None, target_path, entry[0][2], entry[1][1], False))
-                    deletes.append(
-                        (source_path, target_path, entry[0][2], None, False))
-                deletes.append((old_path_utf8, new_path, file_id, None, False))
+                        target_path_utf8 = source_path[len(old_path_utf8) + 1:]
+                    adds.append((None, target_path_utf8,
+                                 entry[0][2], entry[1][1], False))
+                    deletes.append((source_path, target_path_utf8, entry[0][2],
+                                    None, False))
+
+                deletes.append((old_path_utf8, new_path_utf8, file_id,
+                                None, False))
+
         self._check_delta_ids_absent(new_ids, delta, 1)
         try:
             # Finish expunging deletes/first half of renames.