← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-15 15:03:15 UTC
  • mfrom: (4797.42.3 2.1-integration)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: v.ladeuil+lp@free.fr-20100415150315-y2bbh2tzvshyzet0
Merge 2.1 into bzr.dev including fixes for #262450, #373898, #498409

Show diffs side-by-side

added added

removed removed

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