← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_merge_directive.py

  • Committer: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_merge_directive.py
22
22
 
23
23
from bzrlib import (
24
24
    chk_map,
 
25
    errors,
25
26
    merge_directive,
26
 
    )
27
 
 
28
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
29
 
from bzrlib.tests.per_repository_vf import (
30
 
    TestCaseWithRepository,
31
 
    all_repository_vf_format_scenarios,
32
 
    )
33
 
 
34
 
load_tests = load_tests_apply_scenarios
 
27
    tests,
 
28
    )
 
29
 
 
30
from bzrlib.tests.per_repository import TestCaseWithRepository
35
31
 
36
32
 
37
33
class TestMergeDirective(TestCaseWithRepository):
38
34
 
39
 
    scenarios = all_repository_vf_format_scenarios()
40
 
 
41
35
    def make_two_branches(self):
42
36
        builder = self.make_branch_builder('source')
43
37
        builder.start_series()