/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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

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