~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-24 12:53:22 UTC
  • mfrom: (3697.7.3 1.7)
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: john@arbash-meinel.com-20080924125322-p1i7pnr0m49v1hze
Bring in the 1.7 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
1007
1007
            # the fix recommended in bug # 103195 - to delegate this choice the
1008
1008
            # repository itself.
1009
1009
            repo_format = source_repository._format
1010
 
            if not isinstance(repo_format, remote.RemoteRepositoryFormat):
1011
 
                result_format.repository_format = repo_format
 
1010
            if isinstance(repo_format, remote.RemoteRepositoryFormat):
 
1011
                source_repository._ensure_real()
 
1012
                repo_format = source_repository._real_repository._format
 
1013
            result_format.repository_format = repo_format
1012
1014
        try:
1013
1015
            # TODO: Couldn't we just probe for the format in these cases,
1014
1016
            # rather than opening the whole tree?  It would be a little