/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: Ian Clatworthy
  • Date: 2009-03-31 14:56:20 UTC
  • mto: (4296.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 4297.
  • Revision ID: ian.clatworthy@canonical.com-20090331145620-4mgu3w2bg4tfvriq
--include-merges as an alias for --levels 0 in log

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
398
398
message:
399
399
  first post
400
400
------------------------------------------------------------
401
 
Use --levels 0 (or -n0) to see merged revisions.
 
401
Use --include-merges or -n0 to see merged revisions.
402
402
""")
403
403
 
404
404
    def test_force_merge_revisions_on(self):
424
424
 
425
425
""")
426
426
 
 
427
    def test_include_merges(self):
 
428
        # Confirm --include-merges gives the same output as -n0
 
429
        self._prepare_short()
 
430
        out_im, err_im = self.run_bzr('log --include-merges')
 
431
        out_n0, err_n0 = self.run_bzr('log -n0')
 
432
        self.assertEqual(err_im, err_n0)
 
433
        self.assertEqual(out_im, out_n0)
 
434
 
427
435
    def test_force_merge_revisions_N(self):
428
436
        self._prepare_short()
429
437
        out,err = self.run_bzr('log --short -n2')
607
615
      @@ -0,0 +1,1 @@
608
616
      +contents of parent/file2
609
617
 
610
 
Use --levels 0 (or -n0) to see merged revisions.
 
618
Use --include-merges or -n0 to see merged revisions.
611
619
""")
612
620
 
613
621
    def test_log_show_diff_line(self):
645
653
      @@ -0,0 +1,1 @@
646
654
      +contents of parent/file2
647
655
 
648
 
Use --levels 0 (or -n0) to see merged revisions.
 
656
Use --include-merges or -n0 to see merged revisions.
649
657
""")
650
658
        out,err = self.run_bzr('log -p --short file1')
651
659
        self.assertEqual('', err)