← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mutabletree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-18 10:55:12 UTC
  • mfrom: (5887.1.1 trivial_close_earlier)
  • Revision ID: pqm@pqm.ubuntu.com-20110518105512-8rhaqw4g6a8pnjuo
(jameinel) Close file objects a bit earlier in _seek_and_read. Helps PyPy's
 lazy collector. (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mutabletree.py
55
55
        self.assertTrue(self.tree.has_changes())
56
56
 
57
57
    def test_with_pending_merges(self):
58
 
        self.tree.commit('first commit')
59
58
        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
60
 
        other_tree.commit('mergeable commit')
 
59
        self.build_tree(['other/file'])
 
60
        other_tree.add('file')
 
61
        other_tree.commit('added file')
61
62
        self.tree.merge_from_branch(other_tree.branch)
62
63
        self.assertTrue(self.tree.has_changes())