← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
353
353
 
354
354
    def make_trees(self):
355
355
        tree_a = self.make_branch_and_tree('tree_a')
356
 
        tree_a.branch.get_config().set_user_option('email',
357
 
            'J. Random Hacker <jrandom@example.com>')
 
356
        tree_a.branch.get_config_stack().set(
 
357
            'email', 'J. Random Hacker <jrandom@example.com>')
358
358
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_b\n'),
359
359
                                  ('tree_a/file_2', 'content_x\rcontent_y\r')])
360
360
        tree_a.add(['file', 'file_2'])
462
462
        time = 453
463
463
        timezone = 7200
464
464
        class FakeBranch(object):
465
 
            def get_config(self):
 
465
            def get_config_stack(self):
466
466
                return self
467
467
            def gpg_signing_command(self):
468
468
                return 'loopback'