← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
101
101
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
102
102
            *args, **kwargs)
103
103
 
104
 
    def _get_checkout_format(self):
 
104
    def _get_checkout_format(self, lightweight=False):
105
105
        """Return the most suitable metadir for a checkout of this branch.
106
106
        Weaves are used if this branch's repository uses weaves.
107
107
        """