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

Merge tree reference fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bzrdir.py
842
842
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, t)
843
843
 
844
844
    def test_sprout_recursive(self):
845
 
        tree = self.make_branch_and_tree('tree1',
846
 
                                         format='development-subtree')
847
 
        sub_tree = self.make_branch_and_tree('tree1/subtree',
848
 
                                             format='development-subtree')
 
845
        tree = self.make_branch_and_tree('tree1')
 
846
        sub_tree = self.make_branch_and_tree('tree1/subtree')
849
847
        sub_tree.set_root_id(b'subtree-root')
850
848
        tree.add_reference(sub_tree)
 
849
        tree.set_reference_info('subtree', sub_tree.branch.user_url)
851
850
        self.build_tree(['tree1/subtree/file'])
852
851
        sub_tree.add('file')
853
852
        tree.commit('Initial commit')
872
871
        sub_tree = self.make_branch_and_tree('tree1/subtree',
873
872
                                             format='development-subtree')
874
873
        tree.add_reference(sub_tree)
 
874
        tree.set_reference_info('subtree', sub_tree.branch.user_url)
875
875
        self.build_tree(['tree1/subtree/file'])
876
876
        sub_tree.add('file')
877
877
        tree.commit('Initial commit')
878
878
        # The following line force the orhaning to reveal bug #634470
879
 
        tree.branch.get_config_stack().set(
880
 
            'transform.orphan_policy', 'move')
 
879
        tree.branch.get_config_stack().set('transform.orphan_policy', 'move')
881
880
        tree.controldir.destroy_workingtree()
882
881
        # FIXME: subtree/.bzr is left here which allows the test to pass (or
883
882
        # fail :-( ) -- vila 20100909