← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/__init__.py

  • Committer: Robert Collins
  • Date: 2006-09-04 08:00:00 UTC
  • mto: (1981.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1982.
  • Revision ID: robertc@robertcollins.net-20060904080000-1152da5eed765694
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/__init__.py
60
60
        'bzrlib.tests.workingtree_implementations.test_is_control_filename',
61
61
        'bzrlib.tests.workingtree_implementations.test_is_ignored',
62
62
        'bzrlib.tests.workingtree_implementations.test_locking',
 
63
        'bzrlib.tests.workingtree_implementations.test_merge_from_branch',
63
64
        'bzrlib.tests.workingtree_implementations.test_parents',
64
65
        'bzrlib.tests.workingtree_implementations.test_pull',
65
66
        'bzrlib.tests.workingtree_implementations.test_workingtree',