~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for the extra cases that WorkingTree.walkdirs can encounter."""
18
18
 
20
20
 
21
21
from bzrlib import transform
22
22
from bzrlib.tests import SymlinkFeature
23
 
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
 
23
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
24
24
 
25
25
# tests to write:
26
26
# type mismatches - file to link, dir, dir to file, link, link to file, dir