/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: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge.py
24
24
 
25
25
from testtools import matchers
26
26
 
27
 
from brzlib import (
 
27
from breezy import (
28
28
    branch,
29
29
    conflicts,
30
30
    controldir,
34
34
    urlutils,
35
35
    workingtree,
36
36
    )
37
 
from brzlib.tests import (
 
37
from breezy.tests import (
38
38
    scenarios,
39
39
    script,
40
40
    )
306
306
        tree_b.commit('merge branch_c')
307
307
 
308
308
    def test_merge_bundle(self):
309
 
        from brzlib.testament import Testament
 
309
        from breezy.testament import Testament
310
310
        tree_a = self.make_branch_and_tree('branch_a')
311
311
        self.build_tree_contents([('branch_a/a', 'hello')])
312
312
        tree_a.add('a')