← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
408
408
        :seealso Inventory.apply_delta: For details on the changes parameter.
409
409
        """
410
410
        self.flush()
411
 
        inv = self.inventory
 
411
        inv = self.root_inventory
412
412
        inv.apply_delta(changes)
413
413
        self._write_inventory(inv)
414
414
 
623
623
            # nb: this relies on someone else checking that the path we're using
624
624
            # doesn't contain symlinks.
625
625
            parent_ie = self._convert_to_directory(parent_ie, inv_dirname)
626
 
        file_id = self.action(self.tree.inventory, parent_ie, path, kind)
 
626
        file_id = self.action(self.tree, parent_ie, path, kind)
627
627
        entry = _mod_inventory.make_entry(kind, basename, parent_ie.file_id,
628
628
            file_id=file_id)
629
629
        self._invdelta[inv_path] = (None, inv_path, entry.file_id, entry)