← 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: Patch Queue Manager
  • Date: 2012-01-27 14:28:32 UTC
  • mfrom: (6445.2.6 avoid-inventory)
  • Revision ID: pqm@pqm.ubuntu.com-20120127142832-qcv2y1c3i0mbt9bl
(jelmer) Avoid the use of inventories in a few more places. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
2529
2529
        state = self.create_empty_dirstate()
2530
2530
        state.set_state_from_scratch(active_tree.inventory,
2531
2531
            [('basis', basis_tree)], [])
2532
 
        delta = target_tree.inventory._make_delta(basis_tree.inventory)
 
2532
        delta = target_tree.inventory._make_delta(
 
2533
            basis_tree.inventory)
2533
2534
        state.update_basis_by_delta(delta, 'target')
2534
2535
        state._validate()
2535
2536
        dirstate_tree = workingtree_4.DirStateRevisionTree(state,