← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-09 22:22:50 UTC
  • mfrom: (1558.4.4 Aaron's integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060309222250-8bc4180b1ba28f13
small fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
348
348
        else:
349
349
            all_ids = set(base_tree)
350
350
            all_ids.update(other_tree)
 
351
        working_tree.lock_write()
351
352
        self.tt = TreeTransform(working_tree, self.pb)
352
353
        try:
353
354
            self.pp.next_phase()
372
373
                warning(line)
373
374
            self.pp.next_phase()
374
375
            results = self.tt.apply()
 
376
            self.write_modified(results)
375
377
        finally:
376
378
            try:
377
379
                self.tt.finalize()
378
380
            except:
379
381
                pass
 
382
            working_tree.unlock()
380
383
            self.pb.clear()
381
 
        self.write_modified(results)
382
384
 
383
385
    def write_modified(self, results):
384
386
        modified_hashes = {}