← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py
186
186
            base_text, True)
187
187
        builder.change_contents('clog-id', other=other_text, this=this_text)
188
188
        merger = builder.make_merger(merge.Merge3Merger, ['clog-id'])
 
189
        # The following can't use config stacks until the plugin itself does
 
190
        # ('this_branch' is already write locked at this point and as such
 
191
        # won't write the new value to disk where get_user_option can get it).
189
192
        merger.this_branch.get_config().set_user_option(
190
193
            'changelog_merge_files', 'ChangeLog')
191
 
        merge_hook_params = merge.MergeHookParams(merger, 'clog-id', None,
 
194
        merge_hook_params = merge.MergeFileHookParams(merger, 'clog-id', None,
192
195
            'file', 'file', 'conflict')
193
196
        changelog_merger = changelog_merge.ChangeLogMerger(merger)
194
197
        return changelog_merger, merge_hook_params