← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-01-03 19:12:30 UTC
  • mfrom: (3146.4.12 win32fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20080103191230-baidarqql3lct685
Misc cleanups for win32, especially tests (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
138
138
        tree_a.commit(message="hello")
139
139
        dir_b = tree_a.bzrdir.sprout('b')
140
140
        tree_b = dir_b.open_workingtree()
 
141
        tree_b.lock_write()
 
142
        self.addCleanup(tree_b.unlock)
141
143
        tree_a.commit(message="hello again")
142
144
        log = StringIO()
143
145
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),