← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

  • Committer: Andrew Bennetts
  • Date: 2007-03-28 07:08:42 UTC
  • mfrom: (2380 +trunk)
  • mto: (2018.5.146 hpss)
  • mto: This revision was merged to the branch mainline in revision 2414.
  • Revision ID: andrew.bennetts@canonical.com-20070328070842-r843houy668oxb9o
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
42
42
 
43
43
 
44
44
def merge_bundle(reader, tree, check_clean, merge_type, 
45
 
                    reprocess, show_base):
 
45
                    reprocess, show_base, change_reporter=None):
46
46
    """Merge a revision bundle into the current tree."""
47
47
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
48
48
    try:
49
49
        pp = ProgressPhase("Merge phase", 6, pb)
50
50
        pp.next_phase()
51
51
        install_bundle(tree.branch.repository, reader)
52
 
        merger = Merger(tree.branch, this_tree=tree, pb=pb)
 
52
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
 
53
                        change_reporter=change_reporter)
53
54
        merger.pp = pp
54
55
        merger.pp.next_phase()
55
56
        merger.check_basis(check_clean, require_commits=False)