Rev 2305: merge only needs a lock_tree_write() on the working tree, not a full lock_write() in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

------------------------------------------------------------
revno: 2305
revision-id: john at arbash-meinel.com-20070214201327-16eleapizxjo7vm6
parent: john at arbash-meinel.com-20070214200940-s84qp76syr3kywlt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-14 14:13:27 -0600
message:
  merge only needs a lock_tree_write() on the working tree, not a full lock_write()
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2007-02-13 22:58:54 +0000
+++ b/bzrlib/merge.py	2007-02-14 20:13:27 +0000
@@ -267,7 +267,7 @@
         elif self.show_base:
             raise BzrError("Showing base is not supported for this"
                                   " merge type. %s" % self.merge_type)
-        self.this_tree.lock_write()
+        self.this_tree.lock_tree_write()
         if self.base_tree is not None:
             self.base_tree.lock_read()
         if self.other_tree is not None: