~jelmer/brz/byov-trunk

« back to all changes in this revision

Viewing changes to breezy/propose.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-03-07 15:17:55 UTC
  • mfrom: (7496.1.2 trunk-merge-3.0)
  • Revision ID: breezy.the.bot@gmail.com-20200307151755-b5g0v8o9r80qhmp5
Merge the lp:brz/3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/380392

Show diffs side-by-side

added added

removed removed

Lines of Context:
200
200
 
201
201
    def create_proposal(self, description, reviewers=None, labels=None,
202
202
                        prerequisite_branch=None, commit_message=None,
203
 
                        work_in_progress=False):
 
203
                        work_in_progress=False, allow_collaboration=False):
204
204
        """Create a proposal to merge a branch for merging.
205
205
 
206
206
        :param description: Description for the merge proposal
210
210
        :param commit_message: Optional commit message
211
211
        :param work_in_progress:
212
212
            Whether this merge proposal is still a work-in-progress
 
213
        :param allow_collaboration:
 
214
            Whether to allow changes to the branch from the target branch
 
215
            maintainer(s)
213
216
        :return: A `MergeProposal` object
214
217
        """
215
218
        raise NotImplementedError(self.create_proposal)