~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-03-03 02:43:23 UTC
mfrom: (5609.21.2 repository-user-url-false-alarm-726584-2.3)
mto: (5695.1.1 merge-2.3-to-trunk) (5609.29.1 2.3) (5713.1.1 trunk) (5582.13.2 654733-xmlrpc-failures) (5722.1.1 trunk) (5731.1.1 merge-2.3-into-devel) (5740.1.1 integration) (5050.72.2 whoami) (5753.1.1 integration) (5752.2.1 2.4-transform-cache-sha-740932) (5779.2.1 trunk) (4797.86.2 preview-pull-760152) (5793.3.1 integration) (5810.1.1 trunk) (5853.1.2 trunk) (5881.1.1 trunk) (5905.1.1 merge-2.3-into-devel) (5965.1.1 trunk) (5979.1.1 trunk) (6015.5.1 2.4.0-dev)
mto: This revision was merged to the branch mainline in revision 5696.
Revision ID: pqm@pqm.ubuntu.com-20110303024323-57o1k07yel87612r

(spiv) Fix AssertionError in RemoteBranchFormat.initialize when reusing a
smart transport. (Andrew Bennetts)

added added

removed removed

181

182

:param path: The path to the bzrdir.

183

:param network_name: The network name of the branch type to create.

184

:return: (ok, network_name)

184

:return: ('ok', branch_format, repo_path, rich_root, tree_ref,

185

external_lookup, repo_format)

185

186

"""

186

187

bzrdir = BzrDir.open_from_transport(

187

188

self.transport_from_client_path(path))