← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Danny van Heumen
  • Date: 2010-03-08 13:12:55 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100308131255-lgu4k3b4tc1g2729
Changed lock in revert command from branch write lock to tree write lock + branch read lock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4045
4045
    def run(self, revision=None, no_backup=False, file_list=None,
4046
4046
            forget_merges=None):
4047
4047
        tree, file_list = tree_files(file_list)
4048
 
        tree.lock_write()
 
4048
        tree.lock_tree_write()
4049
4049
        try:
4050
4050
            if forget_merges:
4051
4051
                tree.set_parent_ids(tree.get_parent_ids()[:1])