← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_commit.py
19
19
 
20
20
from bzrlib import (
21
21
    branch,
22
 
    bzrdir,
23
22
    conflicts,
 
23
    controldir,
24
24
    errors,
25
25
    mutabletree,
26
26
    osutils,
264
264
        del master
265
265
        # check its corrupted.
266
266
        self.assertRaises(errors.UnknownFormatError,
267
 
                          bzrdir.BzrDir.open,
 
267
                          controldir.ControlDir.open,
268
268
                          'master')
269
269
        tree.commit('foo', rev_id='foo', local=True)
270
270