← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

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