/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

Merge propagate-exceptions into http-leaks resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
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):
1737
1738
                elif kind == 'directory':
1738
1739
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1739
1740
                elif kind == 'symlink':
1740
 
                    inv_entry.executable = False
1741
 
                    inv_entry.text_size = None
1742
1741
                    inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1743
1742
                elif kind == 'tree-reference':
1744
1743
                    inv_entry.reference_revision = fingerprint or None