← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge_directive.py

(vila) Migrate more branch config options to config stacks. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
44
44
    def prepare_merge_directive(self):
45
45
        self.tree1 = self.make_branch_and_tree('tree1')
46
46
        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\n')])
47
 
        self.tree1.branch.get_config().set_user_option('email',
48
 
            'J. Random Hacker <jrandom@example.com>')
 
47
        self.tree1.branch.get_config_stack().set(
 
48
            'email', 'J. Random Hacker <jrandom@example.com>')
49
49
        self.tree1.add('file')
50
50
        self.tree1.commit('foo', rev_id='foo-id')
51
51
        self.tree2 = self.tree1.bzrdir.sprout('tree2').open_workingtree()