/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/tests/test_merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
464
464
        class FakeBranch(object):
465
465
            def get_config_stack(self):
466
466
                return self
467
 
            def gpg_signing_command(self):
468
 
                return 'loopback'
469
467
        md = self.make_merge_directive('example:', 'sha', time, timezone,
470
468
            'http://example.com', source_branch="http://example.org",
471
469
            patch='booga', patch_type='diff')