← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2009-07-15 07:32:26 UTC
  • mfrom: (4536 +trunk)
  • mto: (4536.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090715073226-a7ylxd6ctbzeu0o6
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_pull.py
27
27
 
28
28
 
29
29
# The tests here are based on the tests in 
30
 
# bzrlib.tests.branch_implementations.test_pull
 
30
# bzrlib.tests.per_branch.test_pull
31
31
 
32
32
 
33
33
class TestPull(TestCaseWithInterBranch):