/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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-07-20 02:17:05 UTC
  • mfrom: (7518.1.2 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200720021705-5f11tmo1hdqjxm6x
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/387628

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 . import (
28
29
    script,
1076
1077
        # This is nearly like TestResolveNonDirectoryParent but with branch and
1077
1078
        # trunk switched. As such it should certainly produce the same
1078
1079
        # conflict.
1079
 
        self.assertRaises(errors.MalformedTransform,
 
1080
        self.assertRaises(transform.MalformedTransform,
1080
1081
                          self.run_script, """
1081
1082
$ brz init trunk
1082
1083
...