← 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: 2011-04-18 23:21:01 UTC
  • mfrom: (5799 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5800.
  • Revision ID: jelmer@samba.org-20110418232101-utgj6599ow9ny9nh
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
696
696
        inventory = basis.inventory._get_mutable_inventory()
697
697
        basis.unlock()
698
698
        inventory.apply_delta(delta)
699
 
        rev_tree = revisiontree.RevisionTree(self.branch.repository,
 
699
        rev_tree = revisiontree.InventoryRevisionTree(self.branch.repository,
700
700
                                             inventory, new_revid)
701
701
        self.set_parent_trees([(new_revid, rev_tree)])
702
702