← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
52
52
    ImmortalPendingDeletion,
53
53
    LockError,
54
54
    MalformedTransform,
55
 
    NoSuchFile,
56
55
    ReusingTransform,
57
56
)
58
57
from bzrlib.osutils import (
64
63
    features,
65
64
    HardlinkFeature,
66
65
    SymlinkFeature,
67
 
    TestCase,
68
66
    TestCaseInTempDir,
69
67
    TestSkipped,
70
68
)
74
72
    cook_conflicts,
75
73
    _FileMover,
76
74
    FinalPaths,
77
 
    get_backup_name,
78
75
    resolve_conflicts,
79
76
    resolve_checkout,
80
77
    ROOT_PARENT,