← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-26 23:30:56 UTC
  • mfrom: (2044.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060926233056-203e713964b2cd51
(Robert Collins) Forward merge from 0.11rc2 NEWS and performance-regression fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
734
734
                # parent tree from the repository.
735
735
                self._cache_basis_inventory(leftmost_parent_id)
736
736
            else:
737
 
                # It seems Repository.deserialise_inventory is doing this
738
 
                # because apparently commit builder, *doesn't*. It
739
 
                # seems like the in-memory Inventory should always have
740
 
                # the root.revision set without having to serialize out
741
 
                # to disk first.
742
737
                inv = leftmost_parent_tree.inventory
743
 
                if not self.branch.repository._format.rich_root_data:
744
 
                    inv.root.revision = leftmost_parent_id
745
738
                xml = self._create_basis_xml_from_inventory(
746
739
                                        leftmost_parent_id, inv)
747
740
                self._write_basis_inventory(xml)