← Back to branch summary

~jelmer/brz/colocated-spec

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/changelog_merge/__init__.py
56
56
"""
57
57
 
58
58
# Since we are a built-in plugin we share the breezy version
59
 
from breezy import version_info
60
 
from breezy.hooks import install_lazy_named_hook
 
59
from ... import version_info
 
60
from ...hooks import install_lazy_named_hook
61
61
 
62
62
# Put most of the code in a separate module that we lazy-import to keep the
63
63
# overhead of this plugin as minimal as possible.
64
64
def changelog_merge_hook(merger):
65
65
    """Merger.merge_file_content hook for GNU-format ChangeLog files."""
66
 
    from breezy.plugins.changelog_merge.changelog_merge import ChangeLogMerger
 
66
    from ...plugins.changelog_merge.changelog_merge import ChangeLogMerger
67
67
    return ChangeLogMerger(merger)
68
68
 
69
69
install_lazy_named_hook("breezy.merge", "Merger.hooks", "merge_file_content",