fix: merge alembic heads c7d58e2a4f93 and 5a139f0e951e#11518
Merged
HyeockJinKim merged 4 commits intomainfrom May 8, 2026
Merged
fix: merge alembic heads c7d58e2a4f93 and 5a139f0e951e#11518HyeockJinKim merged 4 commits intomainfrom
HyeockJinKim merged 4 commits intomainfrom
Conversation
Two migrations landed on main with the same parent (``ba5923b1f4a7`` / ``3632aad9d5d9`` chain split): - ``c7d58e2a4f93`` -- drop_endpoint_name_unique_index (BA-5974) - ``5a139f0e951e`` -- add_updated_at_to_vfolders (BA-5504) ``check-multiple-alembic-heads`` now fails on every PR until the chain is reconciled. Add an empty merge revision pointing at both heads so ``alembic upgrade head`` resolves to a single tip again. No schema changes; the upgrade/downgrade bodies are intentionally no-ops. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
github-actions
Bot
added
size:S
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Adds an Alembic merge migration to reconcile two diverged heads so alembic upgrade head resolves to a single tip again (no schema changes).
Changes:
- Introduce a no-op Alembic merge revision pointing to both existing heads.
- Add a changelog entry documenting the fix.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/ai/backend/manager/models/alembic/versions/6b8149885649_merge_c7d58e2a4f93_and_5a139f0e951e.py | Adds a merge revision that reunifies two Alembic heads with no-op upgrade/downgrade. |
| changes/11518.fix.md | Documents the migration-head reconciliation in the changelog. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jopemachine
added
the
skip:changelog
seedspirit
previously approved these changes
May 8, 2026
Add a one-line note to the module docstring so a future reader can tell at a glance that this revision is a head-merge with no schema changes, not an incomplete migration. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
HyeockJinKim
approved these changes
May 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two migrations landed on main with the same parent so
check-multiple-alembic-headsis now failing on every PR opened against main:c7d58e2a4f93— drop_endpoint_name_unique_index (fix(BA-5974): remove deployment name uniqueness constraint #11507, BA-5974)5a139f0e951e— add_updated_at_to_vfolders (feat(BA-5504): add updated_at column to vfolders #10821, BA-5504)Add an empty merge revision (
6b8149885649) pointing at both heads soalembic upgrade headresolves to a single tip again. No schema changes;upgrade()/downgrade()are intentionally no-ops.Test plan
python scripts/check-multiple-alembic-heads.pyreports a single head (6b8149885649) locallypants lint/pants checkclean on the new revision filecheck-alembic-migrationsgreen on this PR🤖 Generated with Claude Code