← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_3.py

  • Committer: Patch Queue Manager
  • Date: 2014-10-06 16:32:42 UTC
  • mfrom: (6597.2.4 split-diff-tests)
  • Revision ID: pqm@pqm.ubuntu.com-20141006163242-c2cll01cwc24grkk
(vila) Split some tests to be able to get finer grained failures (Vincent
 Ladeuil)

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([])