← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-17 08:41:43 UTC
  • mfrom: (4296.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090417084143-8ias85nrnap1hk9z
log --include-merges (Ian Clatworthy)

Show diffs side-by-side

added added

removed removed

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