/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

merge bzr.dev r3564

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
26
26
from bzrlib.tests.test_log import (
27
27
    normalize_log,
28
28
    )
 
29
from bzrlib.tests import test_log
 
30
 
 
31
 
 
32
class TestCaseWithoutPropsHandler(ExternalBase, test_log.TestCaseWithoutPropsHandler):
 
33
    pass
29
34
 
30
35
 
31
36
class TestLog(ExternalBase):
185
190
        self.assertContainsRe(log, r'revno: 2\n')
186
191
        self.assertContainsRe(log, r'revno: 3\n')
187
192
 
188
 
class TestLogMerges(ExternalBase):
 
193
 
 
194
class TestLogMerges(TestCaseWithoutPropsHandler):
189
195
 
190
196
    def _prepare(self):
191
197
        parent_tree = self.make_branch_and_tree('parent')