~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

merge 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
from bzrlib import errors
24
24
from bzrlib.memorytree import MemoryTree
25
25
from bzrlib.revision import NULL_REVISION
26
 
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
 
26
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
27
27
 
28
28
 
29
29
class TestPull(TestCaseWithBranch):