/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 bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2007-12-17 19:21:20 UTC
  • mto: This revision was merged to the branch mainline in revision 3128.
  • Revision ID: abentley@panoramicfeedback.com-20071217192120-tpicwyj0qvvrjugp
Require the user to upgrade if they run split in a non-rich-root tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1024
1024
        branch_transport = mkdirs(sub_path)
1025
1025
        if format is None:
1026
1026
            format = self.bzrdir.cloning_metadir()
1027
 
        if not format._repository_format.rich_root_data:
1028
 
            format = bzrdir.format_registry.make_bzrdir('rich-root')
1029
1027
        branch_transport.ensure_base()
1030
1028
        branch_bzrdir = format.initialize_on_transport(branch_transport)
1031
1029
        try:
1032
1030
            repo = branch_bzrdir.find_repository()
1033
1031
        except errors.NoRepositoryPresent:
1034
1032
            repo = branch_bzrdir.create_repository()
1035
 
            assert repo.supports_rich_root()
1036
 
        else:
1037
 
            if not repo.supports_rich_root():
1038
 
                raise errors.RootNotRich()
 
1033
        if not repo.supports_rich_root():
 
1034
            raise errors.RootNotRich()
1039
1035
        new_branch = branch_bzrdir.create_branch()
1040
1036
        new_branch.pull(self.branch)
1041
1037
        for parent_id in self.get_parent_ids():