/brz/remove-bazaar : revision 7490.7.19

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

Committer: Breezy landing bot
Author(s): Jelmer Vernooĳ
Date: 2020-04-28 02:49:47 UTC
mfrom: (7490.25.1 gitlab-typo)
mto: (7490.29.1 work) (7500.1.1 trunk-merge-3.1) (7506.1.1 merge-3.1) (7467.4.8 renames) (7510.1.1 merge-3.1) (7515.1.1 merge-3.1) (7516.1.1 merge-3.1) (7518.1.1 merge-3.1) (7519.1.1 merge-3.1) (7520.1.1 merge-3.1) (7524.2.1 merge-3.1) (7526.2.1 merge-3.1)
mto: This revision was merged to the branch mainline in revision 7501.
Revision ID: breezy.the.bot@gmail.com-20200428024947-zgizx1g91gclinx1

gitlab: Fix raising of ProposalExists.

Merged from https://code.launchpad.net/~jelmer/brz/gitlab-typo/+merge/383037

added added

removed removed

648

try:

649

merge_request = self.gl._create_mergerequest(**kwargs)

650

except MergeRequestExists:

651

raise ProposalExists(self.source_branch.user_url)

651

raise MergeProposalExists(self.source_branch.user_url)

652

return GitLabMergeProposal(self.gl, merge_request)

653

654