~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Ian Clatworthy
  • Date: 2009-07-13 06:04:28 UTC
  • mfrom: (4527 +trunk)
  • mto: (4527.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4529.
  • Revision ID: ian.clatworthy@canonical.com-20090713060428-5m6apiywie6aqg6v
merge bzr.dev r4527

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):