Rev 2436: test_nested_merge must hold lock while looking at inventory in file:///home/mbp/bzr/Work/subtree/

[Martin Pool]

------------------------------------------------------------
revno: 2436
revision-id: mbp at sourcefrog.net-20070305042053-7janauma57nr4kjf
parent: mbp at sourcefrog.net-20070305041538-x4iybeq8u6tuvscx
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 15:20:53 +1100
message:
  test_nested_merge must hold lock while looking at inventory
modified:
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2007-03-02 09:44:41 +0000
+++ b/bzrlib/tests/test_merge.py	2007-03-05 04:20:53 +0000
@@ -193,9 +193,13 @@
         tree.commit('set text to 1')
         tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
         self.build_tree_contents([('tree2/sub-tree/file', 'text2')])
-        subtree2 = tree2.get_nested_tree(tree2.inventory['sub-tree-root'],
-                                         'sub-tree')
-        tree2.commit('changed file text')
+        tree2.lock_write()
+        try:
+            subtree2 = tree2.get_nested_tree(tree2.inventory['sub-tree-root'],
+                                             'sub-tree')
+            tree2.commit('changed file text')
+        finally:
+            tree2.unlock()
         tree.merge_from_branch(tree2.branch)
         self.assertFileEqual('text2', 'tree/sub-tree/file')