Rev 4628: Lock the output tree for write in merge.transform_tree. in http://bazaar.launchpad.net/~lifeless/bzr/transform_tree

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/transform_tree

------------------------------------------------------------
revno: 4628
revision-id: robertc at robertcollins.net-20090820030650-00gim570vd6nra16
parent: pqm at pqm.ubuntu.com-20090818232740-8q7ms2nntw9ckyvq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transform_tree
timestamp: Thu 2009-08-20 13:06:50 +1000
message:
  Lock the output tree for write in merge.transform_tree.
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2009-07-02 13:07:14 +0000
+++ b/bzrlib/merge.py	2009-08-20 03:06:50 +0000
@@ -64,8 +64,12 @@
 
 
 def transform_tree(from_tree, to_tree, interesting_ids=None):
-    merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
-                interesting_ids=interesting_ids, this_tree=from_tree)
+    from_tree.lock_tree_write()
+    try:
+        merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
+                    interesting_ids=interesting_ids, this_tree=from_tree)
+    finally:
+        from_tree.unlock()
 
 
 class Merger(object):