← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
613
613
        self.this_tree.lock_tree_write()
614
614
        self.base_tree.lock_read()
615
615
        self.other_tree.lock_read()
616
 
        self.tt = TreeTransform(self.this_tree, self.pb)
617
616
        try:
618
 
            self.pp.next_phase()
619
 
            self._compute_transform()
620
 
            self.pp.next_phase()
621
 
            results = self.tt.apply(no_conflicts=True)
622
 
            self.write_modified(results)
 
617
            self.tt = TreeTransform(self.this_tree, self.pb)
623
618
            try:
624
 
                self.this_tree.add_conflicts(self.cooked_conflicts)
625
 
            except UnsupportedOperation:
626
 
                pass
 
619
                self.pp.next_phase()
 
620
                self._compute_transform()
 
621
                self.pp.next_phase()
 
622
                results = self.tt.apply(no_conflicts=True)
 
623
                self.write_modified(results)
 
624
                try:
 
625
                    self.this_tree.add_conflicts(self.cooked_conflicts)
 
626
                except UnsupportedOperation:
 
627
                    pass
 
628
            finally:
 
629
                self.tt.finalize()
627
630
        finally:
628
 
            self.tt.finalize()
629
631
            self.other_tree.unlock()
630
632
            self.base_tree.unlock()
631
633
            self.this_tree.unlock()