← 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: Ian Clatworthy
  • Date: 2009-12-04 22:13:52 UTC
  • mfrom: (4511.3.17 log_returns_too_much)
  • mto: This revision was merged to the branch mainline in revision 4868.
  • Revision ID: ian.clatworthy@canonical.com-20091204221352-5ky1o5d31kqkvbge
https://launchpad.net/bugs/325618
https://launchpad.net/bugs/484109
Merge fix for logging too much

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
536
536
"""
537
537
        self.check_log(expected, ['-n0', '-r1.1.1..1.1.2'])
538
538
 
 
539
    def test_merges_partial_range_ignore_before_lower_bound(self):
 
540
        """Dont show revisions before the lower bound's merged revs"""
 
541
        expected = """\
 
542
    2 Lorem Ipsum\t2005-11-22 [merge]
 
543
      merge branch level1
 
544
 
 
545
          1.1.2 Lorem Ipsum\t2005-11-22 [merge]
 
546
                merge branch level2
 
547
 
 
548
              1.2.1 Lorem Ipsum\t2005-11-22
 
549
                    in branch level2
 
550
 
 
551
"""
 
552
        self.check_log(expected, ['--short', '-n0', '-r1.1.2..2'])
 
553
 
539
554
 
540
555
class TestLogDiff(TestLog):
541
556