← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/groupcompress_repo.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
954
954
            else:
955
955
                basis_tree = self.revision_tree(basis_revision_id)
956
956
                basis_tree.lock_read()
957
 
                basis_inv = basis_tree.inventory
 
957
                basis_inv = basis_tree.root_inventory
958
958
        try:
959
959
            result = basis_inv.create_by_apply_delta(delta, new_revision_id,
960
960
                propagate_caches=propagate_caches)