← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2006-10-18 02:26:35 UTC
  • mto: This revision was merged to the branch mainline in revision 2088.
  • Revision ID: aaron.bentley@utoronto.ca-20061018022635-3fd648bf19f8e56f
Support updating lightweight checkouts of readonly branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
376
376
        else:
377
377
            all_ids = set(base_tree)
378
378
            all_ids.update(other_tree)
379
 
        working_tree.lock_write()
 
379
        working_tree.lock_tree_write()
380
380
        self.tt = TreeTransform(working_tree, self.pb)
381
381
        try:
382
382
            self.pp.next_phase()