/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/bundle/bundle_data.py

Merge bzr.dev,

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
539
539
            return None
540
540
        if old_path in self.deleted:
541
541
            return None
542
 
        if hasattr(self.base_tree, 'path2id'):
 
542
        if getattr(self.base_tree, 'path2id', None) is not None:
543
543
            return self.base_tree.path2id(old_path)
544
544
        else:
545
545
            return self.base_tree.inventory.path2id(old_path)