/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-01-11 04:33:12 UTC
  • mto: (5582.12.2 weave-plugin)
  • mto: This revision was merged to the branch mainline in revision 5718.
  • Revision ID: jelmer@samba.org-20110111043312-g4wx6iuf9662f36d
Move weave formats into bzrlib.plugins.weave_fmt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_workingtree.py
39
39
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
40
40
from bzrlib.trace import mutter
41
41
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
42
 
                                WorkingTree, WorkingTree2)
 
42
                                WorkingTree)
43
43
from bzrlib.conflicts import ConflictList, TextConflict, ContentsConflict
44
44
 
 
45
from bzrlib.plugins.weave_fmt.workingtree import WorkingTree2
 
46
 
45
47
 
46
48
class TestWorkingTree(TestCaseWithWorkingTree):
47
49