~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

[merge] test renames and other fixes (John)

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
from bzrlib.clone import copy_branch
35
35
from bzrlib.errors import BzrCommandError
36
36
from bzrlib.osutils import has_symlinks
37
 
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
 
37
from bzrlib.tests import TestCaseInTempDir, BzrTestBase
38
38
from bzrlib.annotate import annotate_file
39
39
 
40
40