/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 breezy/tests/blackbox/test_split.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_split.py
16
16
 
17
17
 
18
18
from breezy import tests, workingtree
19
 
from breezy.bzr.knitrepo import RepositoryFormatKnit4
20
 
from breezy.bzr.knitpack_repo import RepositoryFormatKnitPack4
 
19
from breezy.repofmt.knitrepo import RepositoryFormatKnit4
 
20
from breezy.repofmt.knitpack_repo import RepositoryFormatKnitPack4
 
21
 
21
22
 
22
23
 
23
24
class TestSplit(tests.TestCaseWithTransport):
28
29
        wt.add(['b', 'b/c'])
29
30
        wt.commit('rev1')
30
31
        self.run_bzr('split a/b')
31
 
        self.run_bzr_error(('.* is not versioned',),
32
 
                           'split q', working_dir='a')
 
32
        self.run_bzr_error(('.* is not versioned',), 'split q', working_dir='a')
33
33
 
34
34
    def test_split_repo_failure(self):
35
35
        repo = self.make_repository('branch', shared=True, format='knit')
36
 
        a_branch = repo.controldir.create_branch()
 
36
        a_branch = repo.bzrdir.create_branch()
37
37
        self.build_tree(['a/', 'a/b/', 'a/b/c/', 'a/b/c/d'])
38
38
        wt = a_branch.create_checkout('a', lightweight=True)
39
 
        wt.add(['b', 'b/c', 'b/c/d'], [b'b-id', b'c-id', b'd-id'])
 
39
        wt.add(['b', 'b/c', 'b/c/d'], ['b-id', 'c-id', 'd-id'])
40
40
        wt.commit('added files')
41
41
        self.run_bzr_error(('must upgrade your branch at .*a',), 'split a/b')
42
42
 
45
45
        self.build_tree(['tree/subtree/'])
46
46
        tree.add('subtree')
47
47
        tree.commit('added subtree')
48
 
        self.run_bzr_error(('must upgrade your branch at .*tree', 'rich roots'),
 
48
        self.run_bzr_error(('must upgrade your branch at .*tree','rich roots'),
49
49
                           'split tree/subtree')
50
50
 
51
51
    def split_formats(self, format, repo_format):