~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Aaron Bentley
  • Date: 2007-12-31 16:10:05 UTC
  • mto: This revision was merged to the branch mainline in revision 3241.
  • Revision ID: aaron.bentley@utoronto.ca-20071231161005-3l7s9521wm9zbjxg
Get apply_inventory_delta kinda working, but not children

Show diffs side-by-side

added added

removed removed

Lines of Context:
1222
1222
            for file_id in file_ids:
1223
1223
                self._inventory.remove_recursive_id(file_id)
1224
1224
 
 
1225
    @needs_tree_write_lock
 
1226
    def apply_inventory_delta(self, changes):
 
1227
        """See MutableTree.apply_inventory_delta"""
 
1228
        self.current_dirstate().update_by_delta(changes, self.basedir)
 
1229
 
1225
1230
    def update_basis_by_delta(self, new_revid, delta):
1226
1231
        """See MutableTree.update_basis_by_delta."""
1227
1232
        assert self.last_revision() != new_revid