Breezy

Merge lp:~jelmer/brz/gitlab-typo into lp:brz/3.1

  1. gitlab-typo
  2. Merge into 3.1
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/gitlab-typo
Merge into: lp:brz/3.1
Diff against target: 10 lines (+1/-1)
1 file modified
breezy/plugins/propose/gitlabs.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/gitlab-typo
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+383037@code.launchpad.net

Commit message

gitlab: Fix raising of ProposalExists.

Description of the change

gitlab: Fix raising of ProposalExists.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/plugins/propose/gitlabs.py'
--- breezy/plugins/propose/gitlabs.py 2020-04-13 03:09:11 +0000
+++ breezy/plugins/propose/gitlabs.py 2020-04-28 02:21:04 +0000
@@ -648,7 +648,7 @@
648 try:648 try:
649 merge_request = self.gl._create_mergerequest(**kwargs)649 merge_request = self.gl._create_mergerequest(**kwargs)
650 except MergeRequestExists: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)652 return GitLabMergeProposal(self.gl, merge_request)
653653
654654

Subscribers

People subscribed via source and target branches