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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-23 17:00:36 UTC
  • mfrom: (4032.1.4 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090223170036-3q1v68ewdt8i0to5
(Marius Kruger) Remove all trailing whitespace and add tests to
        enforce this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
44
44
        pb.finished()
45
45
 
46
46
 
47
 
def merge_bundle(reader, tree, check_clean, merge_type, 
 
47
def merge_bundle(reader, tree, check_clean, merge_type,
48
48
                    reprocess, show_base, change_reporter=None):
49
49
    """Merge a revision bundle into the current tree."""
50
50
    pb = bzrlib.ui.ui_factory.nested_progress_bar()