~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_whitebox.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
 
import unittest
19
18
 
20
19
from bzrlib import (
21
20
    osutils,
22
21
    )
23
 
from bzrlib.tests import TestCaseWithTransport, TestCase
24
 
from bzrlib.branch import Branch
 
22
from bzrlib.tests import TestCaseWithTransport
25
23
from bzrlib.errors import PathNotChild
26
24
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
27
25