/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_conflicts.py

Move some more tests to breezy.bzr.

Merged from https://code.launchpad.net/~jelmer/brz/move-bzr-tests/+merge/386406

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_conflicts.py
23
23
    option,
24
24
    osutils,
25
25
    tests,
 
26
    transform,
26
27
    )
27
28
from ..sixish import text_type
28
29
from . import (
1077
1078
        # This is nearly like TestResolveNonDirectoryParent but with branch and
1078
1079
        # trunk switched. As such it should certainly produce the same
1079
1080
        # conflict.
1080
 
        self.assertRaises(errors.MalformedTransform,
 
1081
        self.assertRaises(transform.MalformedTransform,
1081
1082
                          self.run_script, """
1082
1083
$ brz init trunk
1083
1084
...