← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/test_link_tree.py

  • Committer: Aaron Bentley
  • Date: 2011-09-25 01:23:51 UTC
  • mfrom: (778 bzrtools.dev)
  • mto: This revision was merged to the branch mainline in revision 779.
  • Revision ID: aaron@aaronbentley.com-20110925012351-s3q6441rx3tqyw2n
Merged bzrtools.dev into fix-nick-reference.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_link_tree.py
17
17
import os
18
18
 
19
19
from bzrlib.transform import TreeTransform
20
 
from bzrlib.tests import TestCaseWithTransport, HardlinkFeature
 
20
from bzrlib.tests import TestCaseWithTransport
 
21
 
 
22
try:
 
23
    from bzrlib.tests.features import HardlinkFeature
 
24
except ImportError: # bzr < 2.5
 
25
    from bzrlib.tests import HardlinkFeature
21
26
 
22
27
from bzrlib.plugins.bzrtools import command
23
28
from bzrlib.plugins.bzrtools.link_tree import link_tree