← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_walkdirs.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_walkdirs.py
19
19
import os
20
20
 
21
21
from bzrlib import transform
22
 
from bzrlib.tests import SymlinkFeature
 
22
from bzrlib.tests.features import SymlinkFeature
23
23
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
24
24
 
25
25
# tests to write: