← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2006-02-21 17:57:37 UTC
  • mto: (1558.1.4 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 1565.
  • Revision ID: abentley@panoramicfeedback.com-20060221175737-f161366f8426914a
Added progress bar to pull

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
807
807
                reprocess=False, 
808
808
                other_rev_id=None,
809
809
                interesting_files=None,
810
 
                this_tree=None):
 
810
                this_tree=None,
 
811
                pb=DummyProgress()):
811
812
    """Primary interface for merging. 
812
813
 
813
814
        typical use is probably 
816
817
        """
817
818
    if this_tree is None:
818
819
        this_tree = this_branch.working_tree()
819
 
    merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree)
 
820
    merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree, 
 
821
                    pb=pb)
820
822
    merger.backup_files = backup_files
821
823
    merger.merge_type = merge_type
822
824
    merger.interesting_ids = interesting_ids