/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/tests/test_merge.py

  • Committer: Martin Pool
  • Date: 2010-02-10 00:12:06 UTC
  • mto: This revision was merged to the branch mainline in revision 5019.
  • Revision ID: mbp@canonical.com-20100210001206-cu9syqx88vxm04yl
Fix one more merger DummyProgress use

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
392
392
        other_tree.commit('rev2', rev_id='rev2b')
393
393
        this_tree.lock_write()
394
394
        self.addCleanup(this_tree.unlock)
395
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress,
 
395
        merger = _mod_merge.Merger.from_revision_ids(None,
396
396
            this_tree, 'rev2b', other_branch=other_tree.branch)
397
397
        merger.merge_type = _mod_merge.Merge3Merger
398
398
        tree_merger = merger.make_merger()