/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: Aaron Bentley
  • Date: 2007-02-09 17:09:47 UTC
  • mto: This revision was merged to the branch mainline in revision 2288.
  • Revision ID: abentley@panoramicfeedback.com-20070209170947-dnalqph1nyfqfy1z
Get tests passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
825
825
 
826
826
    def __init__(self, working_tree, this_tree, base_tree, other_tree, 
827
827
                 interesting_ids=None, pb=DummyProgress(), pp=None,
828
 
                 reprocess=False):
 
828
                 reprocess=False, change_reporter=None):
829
829
        self.this_revision_tree = self._get_revision_tree(this_tree)
830
830
        self.other_revision_tree = self._get_revision_tree(other_tree)
831
831
        super(WeaveMerger, self).__init__(working_tree, this_tree, 
832
832
                                          base_tree, other_tree, 
833
833
                                          interesting_ids=interesting_ids, 
834
 
                                          pb=pb, pp=pp, reprocess=reprocess)
 
834
                                          pb=pb, pp=pp, reprocess=reprocess,
 
835
                                          change_reporter=change_reporter)
835
836
 
836
837
    def _get_revision_tree(self, tree):
837
838
        """Return a revision tree related to this tree.