← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py
188
188
        merger = builder.make_merger(merge.Merge3Merger, ['clog-id'])
189
189
        merger.this_branch.get_config().set_user_option(
190
190
            'changelog_merge_files', 'ChangeLog')
191
 
        merge_hook_params = merge.MergeHookParams(merger, 'clog-id', None,
 
191
        merge_hook_params = merge.MergeFileHookParams(merger, 'clog-id', None,
192
192
            'file', 'file', 'conflict')
193
193
        changelog_merger = changelog_merge.ChangeLogMerger(merger)
194
194
        return changelog_merger, merge_hook_params