/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: Robert Collins
  • Date: 2009-03-10 00:35:11 UTC
  • mfrom: (4098 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4102.
  • Revision ID: robertc@robertcollins.net-20090310003511-pvtygbimxywwton0
Merge bzr.dev, commands.py was conflicting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
313
313
        merger.do_merge()
314
314
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
315
315
 
 
316
    def test_Merger_defaults_to_DummyProgress(self):
 
317
        branch = self.make_branch('branch')
 
318
        merger = _mod_merge.Merger(branch, pb=None)
 
319
        self.assertIsInstance(merger._pb, progress.DummyProgress)
 
320
 
316
321
    def prepare_cherrypick(self):
317
322
        """Prepare a pair of trees for cherrypicking tests.
318
323