← 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: 2010-04-28 09:40:23 UTC
  • mfrom: (5155.1.5 320119-exclude-ancestry)
  • Revision ID: pqm@pqm.ubuntu.com-20100428094023-7504mlou1qk28r9n
(vila) Add --exclude-common-ancestry log option (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
365
365
                            'options are "utc", "original", "local".'],
366
366
                           ['log', '--timezone', 'foo'])
367
367
 
 
368
    def test_log_exclude_ancestry_no_range(self):
 
369
        self.make_linear_branch()
 
370
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
371
                            ' requires -r with two revisions'],
 
372
                           ['log', '--exclude-common-ancestry'])
 
373
 
 
374
    def test_log_exclude_ancestry_single_revision(self):
 
375
        self.make_merged_branch()
 
376
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
377
                            ' requires two different revisions'],
 
378
                           ['log', '--exclude-common-ancestry',
 
379
                            '-r1.1.1..1.1.1'])
368
380
 
369
381
class TestLogTags(TestLog):
370
382