/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 16:26:22 UTC
  • mto: This revision was merged to the branch mainline in revision 2288.
  • Revision ID: abentley@panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
Add change reporting to pull

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
938
938
                other_rev_id=None,
939
939
                interesting_files=None,
940
940
                this_tree=None,
941
 
                pb=DummyProgress()):
 
941
                pb=DummyProgress(),
 
942
                change_reporter=None):
942
943
    """Primary interface for merging. 
943
944
 
944
945
        typical use is probably 
952
953
             stacklevel=2)
953
954
        this_tree = this_branch.bzrdir.open_workingtree()
954
955
    merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree, 
955
 
                    pb=pb)
 
956
                    pb=pb, change_reporter=change_reporter)
956
957
    merger.backup_files = backup_files
957
958
    merger.merge_type = merge_type
958
959
    merger.interesting_ids = interesting_ids