Rev 2471: simplify merge_nested tests. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2471
revision-id: robertc at robertcollins.net-20070306092410-7ls3yg0dk1l0b2dj
parent: robertc at robertcollins.net-20070306091708-p46394jg9hg5jzjq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 20:24:10 +1100
message:
  simplify merge_nested tests.
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-06 00:28:36 +0000
+++ b/bzrlib/tests/test_merge.py	2007-03-06 09:24:10 +0000
@@ -174,7 +174,7 @@
             conflicts.MissingParent('Created directory', 'b', 'b-id'),
             conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
             tree_z.conflicts())
-        merge_inner(tree_a.branch, tree_z.basis_tree(), base_tree, 
+        merge_inner(tree_a.branch, tree_z.basis_tree(), base_tree,
                     this_tree=tree_a)
         self.assertEqual([
             conflicts.DeletingParent('Not deleting', 'b', 'b-id'),
@@ -194,13 +194,7 @@
         tree.commit('set text to 1')
         tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
         self.build_tree_contents([('tree2/sub-tree/file', 'text2')])
-        tree2.lock_write()
-        try:
-            subtree2 = tree2.get_nested_tree(tree2.inventory['sub-tree-root'],
-                                             'sub-tree')
-            tree2.commit('changed file text')
-        finally:
-            tree2.unlock()
+        tree2.commit('changed file text')
         tree.merge_from_branch(tree2.branch)
         self.assertFileEqual('text2', 'tree/sub-tree/file')