← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge Martin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
924
924
            self.inventory.add(other_root)
925
925
            add_children(self.inventory, other_root)
926
926
            self._write_inventory(self.inventory)
 
927
            # normally we don't want to fetch whole repositories, but i think
 
928
            # here we really do want to consolidate the whole thing.
927
929
            for parent_id in other_tree.get_parent_ids():
928
930
                self.branch.fetch(other_tree.branch, parent_id)
929
931
                self.add_parent_tree_id(parent_id)