~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

[merge] test renames and other fixes (John)

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
"""
22
22
 
23
23
 
24
 
from bzrlib.selftest import TestCaseInTempDir
 
24
from bzrlib.tests import TestCaseInTempDir
25
25
from bzrlib.revisionspec import RevisionSpec
26
26
from bzrlib.merge import merge
27
27
from cStringIO import StringIO