~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

  • Committer: Aaron Bentley
  • Date: 2009-08-19 13:48:22 UTC
  • mfrom: (4628 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4630.
  • Revision ID: aaron@aaronbentley.com-20090819134822-tlzdyyxxy6qc35i8
Merged bzr.dev into shelve-lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
    BzrBranch5,
41
41
    BzrBranchFormat5,
42
42
    BzrBranchFormat6,
 
43
    BzrBranchFormat7,
43
44
    PullResult,
44
45
    _run_with_write_locked_target,
45
46
    )
60
61
    def test_default_format(self):
61
62
        # update this if you change the default branch format
62
63
        self.assertIsInstance(BranchFormat.get_default_format(),
63
 
                BzrBranchFormat6)
 
64
                BzrBranchFormat7)
64
65
 
65
66
    def test_default_format_is_same_as_bzrdir_default(self):
66
67
        # XXX: it might be nice if there was only one place the default was