~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

• browse files at revision 4763.2.4
• compare with another revision
• compare with revision 1055
• download diff
• download tarball
• view history from revision 4763.2.4

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_log.py

1

 

# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd

 

1

# Copyright (C) 2006-2010 Canonical Ltd

2

2

#

3

3

# This program is free software; you can redistribute it and/or modify

4

4

# it under the terms of the GNU General Public License as published by

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

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1