← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-29 21:35:05 UTC
  • mfrom: (4576 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4577.
  • Revision ID: john@arbash-meinel.com-20090729213505-tkqsvy1zfpocu75w
Merge bzr.dev 4576 in prep for NEWS

Show diffs side-by-side

added added

removed removed

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