← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/workingtree.py
105
105
                         _bzrdir=a_bzrdir,
106
106
                         _control_files=branch.control_files)
107
107
        basis_tree = branch.repository.revision_tree(revision_id)
108
 
        if basis_tree.inventory.root is not None:
 
108
        if basis_tree.get_root_id() is not None:
109
109
            wt.set_root_id(basis_tree.get_root_id())
110
110
        # set the parent list and cache the basis tree.
111
111
        if _mod_revision.is_null(revision_id):