Skip to content
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

upload: Check PRs merge into base branch rather than base ref #207

Merged
merged 1 commit into from
Jan 2, 2025
Merged

upload: Check PRs merge into base branch rather than base ref #207

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 revup/topic_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,11 @@ async def mark_rebases(self, skip_rebase: bool) -> None:
if (
review.status == PrStatus.MERGED
and review.pr_info is not None
and review.remote_base != review.pr_info.baseRef
and self.git_ctx.remove_branch_prefix(base_branch) != review.pr_info.baseRef
):
logging.warning(
f"Branch {review.remote_head} was merged into {review.pr_info.baseRef} "
f"instead of {review.remote_base} as expected!"
f"instead of {base_branch} as expected!"
)
# NOTE: This may not iteract well with the check at the end of create_commits
# but they are both corner cases and the worst that could happen is we fail to
Expand Down
Loading