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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-30 19:16:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6639.
  • Revision ID: jelmer@jelmer.uk-20170530191623-t9ls96vjy9wslpoo
Remove deprecated functionality.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_log.py
563
563
        self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
564
564
                             working_dir='level0')
565
565
 
566
 
    def test_include_merges(self):
567
 
        # Confirm --include-merges gives the same output as -n0
568
 
        msg = ("The option '--include-merges' to 'brz log' "
569
 
               "has been deprecated in brz 2.5. "
570
 
               "Please use '--include-merged' instead.\n")
571
 
        self.assertLogRevnos(['--include-merges'],
572
 
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
573
 
                             working_dir='level0', err=msg)
574
 
        self.assertLogRevnos(['--include-merges'],
575
 
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
576
 
                             working_dir='level0', err=msg)
577
 
        out_im, err_im = self.run_bzr('log --include-merges',
578
 
                                      working_dir='level0')
579
 
        out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
580
 
        self.assertEqual(msg, err_im)
581
 
        self.assertEqual('', err_n0)
582
 
        self.assertEqual(out_im, out_n0)
583
 
 
584
566
    def test_include_merged(self):
585
567
        # Confirm --include-merged gives the same output as -n0
586
568
        expected = ['2', '1.1.2', '1.2.1', '1.1.1', '1']