← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge 2.1 into 2.2 including fixes for #262450, #373898, #498409

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4193
4193
    def run(self, revision=None, no_backup=False, file_list=None,
4194
4194
            forget_merges=None):
4195
4195
        tree, file_list = tree_files(file_list)
4196
 
        tree.lock_write()
 
4196
        tree.lock_tree_write()
4197
4197
        self.add_cleanup(tree.unlock)
4198
4198
        if forget_merges:
4199
4199
            tree.set_parent_ids(tree.get_parent_ids()[:1])