~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_split.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
        wt.add(['b', 'b/c'])
32
32
        wt.commit('rev1')
33
33
        self.run_bzr('split a/b')
34
 
        self.run_bzr_error(('.* is not versioned',), 'split q')
 
34
        self.run_bzr_error(('.* is not versioned',), 'split q', working_dir='a')
35
35
 
36
36
    def test_split_repo_failure(self):
37
37
        repo = self.make_repository('branch', shared=True, format='knit')
47
47
        self.build_tree(['tree/subtree/'])
48
48
        tree.add('subtree')
49
49
        tree.commit('added subtree')
50
 
        self.run_bzr_error(('must upgrade your branch at .*tree',),
 
50
        self.run_bzr_error(('must upgrade your branch at .*tree','rich roots'),
51
51
                           'split tree/subtree')
52
52
 
53
53
    def split_formats(self, format, repo_format):