← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-24 12:51:22 UTC
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: john@arbash-meinel.com-20080924125122-0893ip9kz0ik5cjt
Revert the path2id fix, because to_dir can be anywhere, not just
in the same directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
105
105
    def rename_one(self, from_rel, to_rel):
106
106
        file_id = self.path2id(from_rel)
107
107
        to_dir, to_tail = os.path.split(to_rel)
108
 
        to_parent_id = self._inventory[file_id].parent_id
 
108
        to_parent_id = self.path2id(to_dir)
109
109
        self._file_transport.move(from_rel, to_rel)
110
110
        self._inventory.rename(file_id, to_parent_id, to_tail)
111
111