/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_join.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 19:47:19 UTC
  • mfrom: (7178 work)
  • mto: This revision was merged to the branch mainline in revision 7179.
  • Revision ID: jelmer@jelmer.uk-20181116194719-m5ut2wfuze5x9s1p
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_join.py
28
28
 
29
29
    def make_trees(self):
30
30
        base_tree = self.make_branch_and_tree('tree',
31
 
            format='development-subtree')
 
31
                                              format='development-subtree')
32
32
        base_tree.commit('empty commit')
33
33
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
34
34
        sub_tree = self.make_branch_and_tree('tree/subtree')
56
56
        osutils.rename('tree/subtree', 'tree/subtree2/subtree')
57
57
        self.run_bzr_error(
58
58
            ('Cannot join .*subtree.  Parent directory is not versioned',),
59
 
             'join tree/subtree2/subtree')
 
59
            'join tree/subtree2/subtree')
60
60
        # disabled because this gives an ugly error at present -- mbp 20070306
61
 
        ## self.run_bzr_error(
 
61
        # self.run_bzr_error(
62
62
        ##     ('Cannot join .*subtree.  Parent directory is not versioned',),
63
 
        ##      'join', '--reference', 'tree/subtree2/subtree')
 
63
        # 'join', '--reference', 'tree/subtree2/subtree')
64
64
        self.run_bzr_error(('Not a branch:.*subtree2',),
65
65
                           'join tree/subtree2')
66
66