← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
181
181
 
182
182
        :param path: The path to the bzrdir.
183
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))