/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 breezy/bundle/apply_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/apply_bundle.py
39
39
            if repository.has_revision(revision.revision_id):
40
40
                continue
41
41
            cset_tree = bundle_reader.revision_tree(repository,
42
 
                                                       revision.revision_id)
 
42
                                                    revision.revision_id)
43
43
            install_revision(repository, revision, cset_tree)
44
44
 
45
45
 
46
46
def merge_bundle(reader, tree, check_clean, merge_type,
47
 
                    reprocess, show_base, change_reporter=None):
 
47
                 reprocess, show_base, change_reporter=None):
48
48
    """Merge a revision bundle into the current tree."""
49
49
    with ui.ui_factory.nested_progress_bar() as pb:
50
50
        pp = ProgressPhase("Merge phase", 6, pb)