← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 01:56:17 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124015617-b56805ockeulemhf
More test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
2527
2527
        basis_tree = self.create_tree_from_shape('basis', basis)
2528
2528
        target_tree = self.create_tree_from_shape('target', target)
2529
2529
        state = self.create_empty_dirstate()
2530
 
        state.set_state_from_scratch(active_tree.inventory,
 
2530
        state.set_state_from_scratch(active_tree.root_inventory,
2531
2531
            [('basis', basis_tree)], [])
2532
2532
        delta = target_tree.inventory._make_delta(basis_tree.inventory)
2533
2533
        state.update_basis_by_delta(delta, 'target')