/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_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/test_merge.py
17
17
import os
18
18
from StringIO import StringIO
19
19
 
20
 
from brzlib import (
 
20
from breezy import (
21
21
    branch as _mod_branch,
22
22
    cleanup,
23
23
    conflicts,
32
32
    transform,
33
33
    versionedfile,
34
34
    )
35
 
from brzlib.conflicts import ConflictList, TextConflict
36
 
from brzlib.errors import UnrelatedBranches, NoCommits
37
 
from brzlib.merge import transform_tree, merge_inner, _PlanMerge
38
 
from brzlib.osutils import basename, pathjoin, file_kind
39
 
from brzlib.tests import (
 
35
from breezy.conflicts import ConflictList, TextConflict
 
36
from breezy.errors import UnrelatedBranches, NoCommits
 
37
from breezy.merge import transform_tree, merge_inner, _PlanMerge
 
38
from breezy.osutils import basename, pathjoin, file_kind
 
39
from breezy.tests import (
40
40
    features,
41
41
    TestCaseWithMemoryTransport,
42
42
    TestCaseWithTransport,
43
43
    test_merge_core,
44
44
    )
45
 
from brzlib.workingtree import WorkingTree
 
45
from breezy.workingtree import WorkingTree
46
46
 
47
47
 
48
48
class TestMerge(TestCaseWithTransport):
288
288
        self.assertFalse('merge4' in [x[0] for x in
289
289
                        merge_type_option.iter_switches()])
290
290
        registry = _mod_merge.get_merge_type_registry()
291
 
        registry.register_lazy('merge4', 'brzlib.merge', 'Merge4Merger',
 
291
        registry.register_lazy('merge4', 'breezy.merge', 'Merge4Merger',
292
292
                               'time-travelling merge')
293
293
        self.assertTrue('merge4' in [x[0] for x in
294
294
                        merge_type_option.iter_switches()])