Rev 5748: (jelmer) Support installing lazy hooks for all existing hook points, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5748 [merge]
revision-id: pqm at pqm.ubuntu.com-20110331175912-fhowhforwlzn11d3
parent: pqm at pqm.ubuntu.com-20110331162811-w1uw1lgpr5fiawp5
parent: jelmer at samba.org-20110331151005-mtn74ank7ve0xfo7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-03-31 17:59:12 +0000
message:
  (jelmer) Support installing lazy hooks for all existing hook points,
   deprecate Hooks.create_hook. (Jelmer Vernooij)
modified:
  bzrlib/plugins/changelog_merge/__init__.py __init__.py-20100920024628-tdrjysnxjm1q96oq-1
=== modified file 'bzrlib/plugins/changelog_merge/__init__.py'
--- a/bzrlib/plugins/changelog_merge/__init__.py	2011-03-30 14:23:59 +0000
+++ b/bzrlib/plugins/changelog_merge/__init__.py	2011-03-31 15:10:05 +0000
@@ -61,7 +61,7 @@
 # overhead of this plugin as minimal as possible.
 def changelog_merge_hook(merger):
     """Merger.merge_file_content hook for GNU-format ChangeLog files."""
-    from brlib.plugins.changelog_merge.changelog_merge import ChangeLogMerger
+    from bzrlib.plugins.changelog_merge.changelog_merge import ChangeLogMerger
     return ChangeLogMerger(merger)
 
 install_lazy_named_hook("bzrlib.merge", "Merger.hooks", "merge_file_content",