/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: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
from breezy.bzr.knitpack_repo import RepositoryFormatKnitPack4
21
21
 
22
22
 
23
 
 
24
23
class TestSplit(tests.TestCaseWithTransport):
25
24
 
26
25
    def test_split(self):
29
28
        wt.add(['b', 'b/c'])
30
29
        wt.commit('rev1')
31
30
        self.run_bzr('split a/b')
32
 
        self.run_bzr_error(('.* is not versioned',), 'split q', working_dir='a')
 
31
        self.run_bzr_error(('.* is not versioned',),
 
32
                           '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
36
        a_branch = repo.controldir.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-id', 'c-id', 'd-id'])
 
39
        wt.add(['b', 'b/c', 'b/c/d'], [b'b-id', b'c-id', b'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