← 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

(lifeless) Teach BzrDir.find_bzrdirs to handle PermissionDenied errors.
 (Marius Kruger) (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
159
159
        self.assertLogRevnos(['-c1'], ['1'])
160
160
 
161
161
 
 
162
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
 
163
 
 
164
    def test_exclude_common_ancestry_simple_revnos(self):
 
165
        self.make_linear_branch()
 
166
        self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
 
167
                             ['3', '2'])
 
168
 
 
169
 
162
170
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
163
171
 
164
172
    def setUp(self):
167
175
        # stop calling run_bzr, there is no point) --vila 100118.
168
176
        builder = branchbuilder.BranchBuilder(self.get_transport())
169
177
        builder.start_series()
 
178
        # 1
 
179
        # | \
 
180
        # 2  1.1.1
 
181
        # | / |
 
182
        # 3  1.1.2
 
183
        # |   |
 
184
        # |  1.1.3
 
185
        # | / |
 
186
        # 4  1.1.4
 
187
        # | /
 
188
        # 5
 
189
 
170
190
        # mainline
171
191
        builder.build_snapshot('1', None, [
172
192
            ('add', ('', 'root-id', 'directory', ''))])