/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/plugins/news_merge/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
  how to resolve that, so bzr will fallback to the default line-based merge.
34
34
"""
35
35
 
36
 
# Since we are a built-in plugin we share the bzrlib version
37
 
from bzrlib import version_info
38
 
from bzrlib.hooks import install_lazy_named_hook
 
36
# Since we are a built-in plugin we share the breezy version
 
37
from ... import version_info
 
38
from ...hooks import install_lazy_named_hook
39
39
 
40
40
 
41
41
def news_merge_hook(merger):
42
42
    """Merger.merge_file_content hook for bzr-format NEWS files."""
43
 
    from bzrlib.plugins.news_merge.news_merge import NewsMerger
 
43
    from .news_merge import NewsMerger
44
44
    return NewsMerger(merger)
45
45
 
46
46
 
47
 
install_lazy_named_hook("bzrlib.merge", "Merger.hooks", "merge_file_content",
 
47
install_lazy_named_hook("breezy.merge", "Merger.hooks", "merge_file_content",
48
48
    news_merge_hook, "NEWS file merge")
49
49
 
50
50
 
51
 
def load_tests(basic_tests, module, loader):
 
51
def load_tests(loader, basic_tests, pattern):
52
52
    testmod_names = [
53
53
        'tests',
54
54
        ]