~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Aaron Bentley
  • Date: 2007-12-29 21:25:26 UTC
  • mto: This revision was merged to the branch mainline in revision 3162.
  • Revision ID: aaron.bentley@utoronto.ca-20071229212526-d8xatqs93g0m6l6q
Add write lock, so merge_inner works properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
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(),