44
29
def merge_bundle(reader, tree, check_clean, merge_type,
46
31
"""Merge a revision bundle into the current tree."""
47
32
pb = bzrlib.ui.ui_factory.nested_progress_bar()
49
34
pp = ProgressPhase("Merge phase", 6, pb)
51
36
install_bundle(tree.branch.repository, reader)
52
merger = Merger(tree.branch, this_tree=tree, pb=pb,
56
40
merger.check_basis(check_clean, require_commits=False)