← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 03:06:24 UTC
  • mfrom: (4961.2.22 progress)
  • Revision ID: pqm@pqm.ubuntu.com-20100210030624-wnjdp7yy7zb8vu7u
(mbp) Remove passing-around of ProgressBars

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_merger.py
46
46
class TestMergeImplementation(TestCaseWithTransport):
47
47
 
48
48
    def do_merge(self, target_tree, source_tree, **kwargs):
49
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
 
49
        merger = _mod_merge.Merger.from_revision_ids(None,
50
50
            target_tree, source_tree.last_revision(),
51
51
            other_branch=source_tree.branch)
52
52
        merger.merge_type=self.merge_type