← 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: Martin Pool
  • Date: 2010-01-15 04:17:57 UTC
  • mto: This revision was merged to the branch mainline in revision 5019.
  • Revision ID: mbp@sourcefrog.net-20100115041757-cd8pu9o5a511jc8q
Rip out most remaining uses of DummyProgressBar

Show diffs side-by-side

added added

removed removed

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