← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree_4.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-07 00:57:24 UTC
  • mfrom: (6405.2.18 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20120207005724-xvfawh5exf1ohusu
(jelmer) Rename Tree.inventory to Tree.root_inventory. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree_4.py
212
212
        rev1 = subtree.commit('commit in subdir')
213
213
        rev1_tree = subtree.basis_tree()
214
214
        rev1_tree.lock_read()
215
 
        rev1_tree.inventory
 
215
        rev1_tree.root_inventory
216
216
        self.addCleanup(rev1_tree.unlock)
217
217
        rev2 = subtree.commit('second commit in subdir', allow_pointless=True)
218
218
        rev2_tree = subtree.basis_tree()
219
219
        rev2_tree.lock_read()
220
 
        rev2_tree.inventory
 
220
        rev2_tree.root_inventory
221
221
        self.addCleanup(rev2_tree.unlock)
222
222
 
223
223
        tree.branch.pull(subtree.branch)
866
866
        self.addCleanup(tree.unlock)
867
867
        # Force access to the in memory inventory to trigger bug #494221: try
868
868
        # maintaining the in-memory inventory
869
 
        inv = tree.inventory
 
869
        inv = tree.root_inventory
870
870
        self.assertTrue(inv.has_id('a-id'))
871
871
        self.assertTrue(inv.has_id('b-id'))
872
872
        tree.unversion(['a-id', 'b-id'])