← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Andrew Bennetts
  • Date: 2010-07-29 03:56:54 UTC
  • mto: (5050.3.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100729035654-m06dd42c1nbdc3mt
Rename _finish_transform to _finish_computing_transform.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
862
862
        finally:
863
863
            child_pb.finished()
864
864
        self.fix_root()
865
 
        self._finish_transform()
 
865
        self._finish_computing_transform()
866
866
 
867
 
    def _finish_transform(self):
 
867
    def _finish_computing_transform(self):
868
868
        """Finalize the transform and report the changes.
869
869
 
870
870
        This is the second half of _compute_transform.
1883
1883
                    parent_trans_id, self.other_tree)
1884
1884
        finally:
1885
1885
            child_pb.finished()
1886
 
        self._finish_transform()
 
1886
        self._finish_computing_transform()
1887
1887
 
1888
1888
    def _entries_to_incorporate(self):
1889
1889
        """Yields pairs of (inventory_entry, new_parent)."""