← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1370
1370
        :param shared_repo: Control whether made repositories are shared or
1371
1371
            not.
1372
1372
        :param vfs_only: If True do not attempt to use a smart server
1373
 
        :return: repo, bzrdir, require_stacking, repository_policy. repo is
 
1373
        :return: repo, controldir, require_stacking, repository_policy. repo is
1374
1374
            None if none was created or found, bzrdir is always valid.
1375
1375
            require_stacking is the result of examining the stacked_on
1376
1376
            parameter and any stacking policy found for the target.