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

Merge tarball branch that's already with PQM, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
782
782
            result.create_repository()
783
783
        elif source_repository is not None and result_repo is None:
784
784
            # have source, and want to make a new target repo
785
 
            # we don't clone the repo because that preserves attributes
786
 
            # like is_shared(), and we have not yet implemented a 
787
 
            # repository sprout().
788
 
            result_repo = result.create_repository()
789
 
        if result_repo is not None:
 
785
            result_repo = source_repository.sprout(result, revision_id=revision_id)
 
786
        else:
790
787
            # fetch needed content into target.
791
788
            if source_repository is not None:
 
789
                # would rather do 
 
790
                # source_repository.copy_content_into(result_repo, revision_id=revision_id)
 
791
                # so we can override the copy method
792
792
                result_repo.fetch(source_repository, revision_id=revision_id)
793
793
        if source_branch is not None:
794
794
            source_branch.sprout(result, revision_id=revision_id)