/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 breezy/tests/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_workingtree.py
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
 
from breezy import (
 
18
from .. import (
19
19
    bzrdir,
20
20
    conflicts,
21
21
    errors,
24
24
    workingtree_3,
25
25
    workingtree_4,
26
26
    )
27
 
from breezy.lock import write_locked
28
 
from breezy.lockdir import LockDir
29
 
from breezy.mutabletree import needs_tree_write_lock
30
 
from breezy.tests import TestCase, TestCaseWithTransport, TestSkipped
31
 
from breezy.workingtree import (
 
27
from ..lock import write_locked
 
28
from ..lockdir import LockDir
 
29
from ..mutabletree import needs_tree_write_lock
 
30
from . import TestCase, TestCaseWithTransport, TestSkipped
 
31
from ..workingtree import (
32
32
    TreeEntry,
33
33
    TreeDirectory,
34
34
    TreeFile,