← 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: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
90
90
        self._format = _format
91
91
        self._base = a_bzrdir.transport.base
92
92
        self._ignore_fallbacks = False
 
93
        self.bzrdir = a_bzrdir
93
94
        foreign.ForeignBranch.__init__(self, 
94
95
            DummyForeignVcsMapping(DummyForeignVcs()))
95
96
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,