← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

merge only needs a lock_tree_write() on the working tree, not a full lock_write()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
267
267
        elif self.show_base:
268
268
            raise BzrError("Showing base is not supported for this"
269
269
                                  " merge type. %s" % self.merge_type)
270
 
        self.this_tree.lock_write()
 
270
        self.this_tree.lock_tree_write()
271
271
        if self.base_tree is not None:
272
272
            self.base_tree.lock_read()
273
273
        if self.other_tree is not None: