← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_3.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/workingtree_3.py
221
221
        try:
222
222
            basis_tree = branch.repository.revision_tree(revision_id)
223
223
            # only set an explicit root id if there is one to set.
224
 
            if basis_tree.inventory.root is not None:
 
224
            if basis_tree.get_root_id() is not None:
225
225
                wt.set_root_id(basis_tree.get_root_id())
226
226
            if revision_id == _mod_revision.NULL_REVISION:
227
227
                wt.set_parent_trees([])