Skip to content

Include more details when logging GitLabRebaseResultMismatch #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slovdahl merged 1 commit into from
Dec 20, 2022
Merged

Include more details when logging GitLabRebaseResultMismatch #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions marge/single_merge_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ def update_merge_request_and_accept(self, approvals):
merge_request,
source_repo_url=source_repo_url,
)
except GitLabRebaseResultMismatch:
log.info("Gitlab rebase didn't give expected result")
except GitLabRebaseResultMismatch as err:
log.info("Gitlab rebase didn't give expected result: " + err.reason)
merge_request.comment("Someone skipped the queue! Will have to try again...")
continue

Expand Down