← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin Pool
  • Date: 2010-09-15 05:18:54 UTC
  • mfrom: (5425 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5452.
  • Revision ID: mbp@sourcefrog.net-20100915051854-fv6x062f38qo82l1
resolve against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
214
214
        if len(branch_info) != 2:
215
215
            raise errors.UnexpectedSmartServerResponse(response)
216
216
        branch_ref, branch_name = branch_info
217
 
        format = bzrdir.network_format_registry.get(control_name)
 
217
        format = controldir.network_format_registry.get(control_name)
218
218
        if repo_name:
219
219
            format.repository_format = repository.network_format_registry.get(
220
220
                repo_name)