/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_conflicts.py

• browse files at revision 7502.2.1
• compare with another revision
• download diff
• download tarball
• view history from revision 7502.2.1

• reverse the comparison (7502.2.1 to 7519.1.1)
• stop comparing with revision 7519.1.1

Show diffs side-by-side

added

removed

breezy/tests/test_conflicts.py

23

23

    option,

24

24

    osutils,

25

25

    tests,

26

 

    transform,

27

26

    )

28

27

from . import (

29

28

    script,

1077

1076

        # This is nearly like TestResolveNonDirectoryParent but with branch and

1078

1077

        # trunk switched. As such it should certainly produce the same

1079

1078

        # conflict.

1080

 

        self.assertRaises(transform.MalformedTransform,

 

1079

        self.assertRaises(errors.MalformedTransform,

1081

1080

                          self.run_script, """

1082

1081

$ brz init trunk

1083

1082

...

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0