← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

merge 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_pull.py
21
21
from bzrlib import errors
22
22
from bzrlib.errors import NotBranchError, NotVersionedError
23
23
from bzrlib.osutils import basename
24
 
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
 
24
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
25
25
from bzrlib.trace import mutter
26
26
from bzrlib.transport import get_transport
27
27