Breezy

Merge lp:~jelmer/brz/fix-gitlab-conflicts into lp:brz/3.1

  1. fix-gitlab-conflicts
  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/fix-gitlab-conflicts
Merge into: lp:brz/3.1
Diff against target: 17 lines (+2/-2)
1 file modified
breezy/plugins/gitlab/hoster.py (+2/-2)
To merge this branch: bzr merge lp:~jelmer/brz/fix-gitlab-conflicts
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+399951@code.launchpad.net

Commit message

Fix handling of gitlab conflicts.

Description of the change

Fix handling of gitlab conflicts.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/822/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/gitlab/hoster.py'
2--- breezy/plugins/gitlab/hoster.py 2021-03-21 16:56:29 +0000
3+++ breezy/plugins/gitlab/hoster.py 2021-03-21 18:03:07 +0000
4@@ -457,11 +457,11 @@
5 project = self._get_project(project['path_with_namespace'])
6 return project
7
8- def _handle_merge_request_conflict(self, reason, source_url, target_project):
9+ def _handle_merge_request_conflict(self, message, source_url, target_project):
10 m = re.fullmatch(
11 r'Another open merge request already exists for '
12 r'this source branch: \!([0-9]+)',
13- reason['message'][0])
14+ message[0])
15 if m:
16 merge_id = int(m.group(1))
17 mr = self._get_merge_request(target_project, merge_id)

Subscribers

People subscribed via source and target branches