/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/blackbox/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2019-02-03 23:43:20 UTC
  • mfrom: (7267 work)
  • mto: This revision was merged to the branch mainline in revision 7268.
  • Revision ID: jelmer@jelmer.uk-20190203234320-zbquyl9973hbujnb
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge.py
308
308
        tree_b.commit('merge branch_c')
309
309
 
310
310
    def test_merge_bundle(self):
311
 
        from breezy.testament import Testament
 
311
        from breezy.bzr.testament import Testament
312
312
        tree_a = self.make_branch_and_tree('branch_a')
313
313
        self.build_tree_contents([('branch_a/a', b'hello')])
314
314
        tree_a.add('a')