Rev 3568: Revert the path2id fix, because to_dir can be anywhere, not just in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

------------------------------------------------------------
revno: 3568
revision-id: john at arbash-meinel.com-20080924125122-0893ip9kz0ik5cjt
parent: john at arbash-meinel.com-20080905031140-hj0adlcf30l7i99v
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Wed 2008-09-24 07:51:22 -0500
message:
  Revert the path2id fix, because to_dir can be anywhere, not just
  in the same directory.
-------------- next part --------------
=== modified file 'bzrlib/memorytree.py'
--- a/bzrlib/memorytree.py	2008-09-05 03:11:40 +0000
+++ b/bzrlib/memorytree.py	2008-09-24 12:51:22 +0000
@@ -105,7 +105,7 @@
     def rename_one(self, from_rel, to_rel):
         file_id = self.path2id(from_rel)
         to_dir, to_tail = os.path.split(to_rel)
-        to_parent_id = self._inventory[file_id].parent_id
+        to_parent_id = self.path2id(to_dir)
         self._file_transport.move(from_rel, to_rel)
         self._inventory.rename(file_id, to_parent_id, to_tail)