← Back to branch summary

~mbp/bzr/deprecation

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-07-13 22:43:10 UTC
  • mfrom: (5344.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100713224310-irt5swwo7ajwg7e5
(vila) Merge 2.2 into bzr.dev including fixes for bug #525571 and bug
        #494221

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1247
1247
        # have to change the legacy inventory too.
1248
1248
        if self._inventory is not None:
1249
1249
            for file_id in file_ids:
1250
 
                self._inventory.remove_recursive_id(file_id)
 
1250
                if self._inventory.has_id(file_id):
 
1251
                    self._inventory.remove_recursive_id(file_id)
1251
1252
 
1252
1253
    @needs_tree_write_lock
1253
1254
    def rename_one(self, from_rel, to_rel, after=False):