/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Vincent Ladeuil
  • Date: 2010-07-13 16:10:20 UTC
  • mfrom: (4797.58.5 2.1)
  • mto: (5050.3.6 2.2)
  • mto: This revision was merged to the branch mainline in revision 5345.
  • Revision ID: v.ladeuil+lp@free.fr-20100713161020-qak83bylrtq5d1gj
Merge 2.1 into 2.2 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):