← 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-09-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

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
 
 
554
539
 
555
540
class TestLogDiff(TestLog):
556
541