← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Martin Packman
  • Date: 2011-10-14 18:42:17 UTC
  • mto: This revision was merged to the branch mainline in revision 6235.
  • Revision ID: martin.packman@canonical.com-20111014184217-2fmnziqqo4duhgbz
Remove unneeded _LRUNode.cleanup callback ability and deprecate LRUCache.add

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
20
20
from bzrlib import check, osutils
21
21
from bzrlib.errors import PointlessCommit
22
22
from bzrlib.tests import (
 
23
    TestCaseWithTransport,
 
24
    )
 
25
from bzrlib.tests.features import (
23
26
    SymlinkFeature,
24
 
    TestCaseWithTransport,
25
27
    )
26
28
 
27
29