/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/blackbox/test_log.py

  • Committer: Kent Gibson
  • Date: 2007-11-17 09:37:33 UTC
  • mto: This revision was merged to the branch mainline in revision 3067.
  • Revision ID: warthog618@gmail.com-20071117093733-r31dz89u600c6zxm
Support logging single merge revisions with short and line log formatters.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
285
285
    def test_merges_nonsupporting_formatter(self):
286
286
        self._prepare()
287
287
        err_msg = 'Selected log formatter only supports mainline revisions.'
288
 
        out,err = self.run_bzr('log --short -r1.1.2', retcode=3)
289
 
        self.assertContainsRe(err, err_msg)
 
288
        # The single revision case is tested in the core tests
 
289
        # since all standard formatters support single merge revisions.
290
290
        out,err = self.run_bzr('log --short -r1..1.1.2', retcode=3)
291
291
        self.assertContainsRe(err, err_msg)
292
292
        out,err = self.run_bzr('log --short -r1.1.1..1.1.2', retcode=3)