← 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: Jelmer Vernooij
  • Date: 2012-01-24 17:18:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124171838-rlfe6yhyz4rylgcj
Fix tests.

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.root_inventory
215
216
        self.addCleanup(rev1_tree.unlock)
216
217
        rev2 = subtree.commit('second commit in subdir', allow_pointless=True)
217
218
        rev2_tree = subtree.basis_tree()
218
219
        rev2_tree.lock_read()
 
220
        rev2_tree.root_inventory
219
221
        self.addCleanup(rev2_tree.unlock)
220
222
 
221
223
        tree.branch.pull(subtree.branch)