← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2009-08-04 04:36:34 UTC
  • mfrom: (4583 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090804043634-2iu9wpcgs273i97s
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_pull.py
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):