~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

Dirty merge of the mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
import os
32
32
 
33
33
from bzrlib.branch import Branch
34
 
from bzrlib.clone import copy_branch
35
34
from bzrlib.errors import BzrCommandError
36
35
from bzrlib.osutils import has_symlinks
37
36
from bzrlib.tests import TestCaseInTempDir, BzrTestBase