~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-18 23:21:01 UTC
  • mfrom: (5799 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5800.
  • Revision ID: jelmer@samba.org-20110418232101-utgj6599ow9ny9nh
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2183
2183
                    # dont use the repository revision_tree api because we want
2184
2184
                    # to supply the inventory.
2185
2185
                    if inv.revision_id == revision_id:
2186
 
                        return revisiontree.RevisionTree(self.branch.repository,
2187
 
                            inv, revision_id)
 
2186
                        return revisiontree.InventoryRevisionTree(
 
2187
                            self.branch.repository, inv, revision_id)
2188
2188
                except errors.BadInventoryFormat:
2189
2189
                    pass
2190
2190
        # raise if there was no inventory, or if we read the wrong inventory.