/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/merge.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-19 08:44:55 UTC
  • mfrom: (2091 +trunk)
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061019084455-89d30e66e82b1e52
Merge bzr,dev

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()