/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4145
4145
    def run(self, revision=None, no_backup=False, file_list=None,
4146
4146
            forget_merges=None):
4147
4147
        tree, file_list = tree_files(file_list)
4148
 
        tree.lock_write()
 
4148
        tree.lock_tree_write()
4149
4149
        self.add_cleanup(tree.unlock)
4150
4150
        if forget_merges:
4151
4151
            tree.set_parent_ids(tree.get_parent_ids()[:1])