← 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-15 08:20:33 UTC
  • mfrom: (4288.1.12 push.roundtrips)
  • Revision ID: pqm@pqm.ubuntu.com-20090415082033-tds4zs962x6kwc2c
(robertc) Add a Branch.set_parent_location verb and reduce lock
        churning to reduce network round trips. (Robert Collins)

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.
400
402
""")
401
403
 
402
404
    def test_force_merge_revisions_on(self):
422
424
 
423
425
""")
424
426
 
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
 
 
433
427
    def test_force_merge_revisions_N(self):
434
428
        self._prepare_short()
435
429
        out,err = self.run_bzr('log --short -n2')
613
607
      @@ -0,0 +1,1 @@
614
608
      +contents of parent/file2
615
609
 
616
 
Use --include-merges or -n0 to see merged revisions.
 
610
Use --levels 0 (or -n0) to see merged revisions.
617
611
""")
618
612
 
619
613
    def test_log_show_diff_line(self):
651
645
      @@ -0,0 +1,1 @@
652
646
      +contents of parent/file2
653
647
 
654
 
Use --include-merges or -n0 to see merged revisions.
 
648
Use --levels 0 (or -n0) to see merged revisions.
655
649
""")
656
650
        out,err = self.run_bzr('log -p --short file1')
657
651
        self.assertEqual('', err)