Skip to content

Refresh stack child head guards after collapse#620

Merged
cbusillo merged 1 commit into
mainfrom
fix/stack-collapse-child-heads
May 14, 2026
Merged

Refresh stack child head guards after collapse#620
cbusillo merged 1 commit into
mainfrom
fix/stack-collapse-child-heads

Conversation

@cbusillo
Copy link
Copy Markdown
Owner

Summary

  • update stack child close guards after each collapse merge advances an intermediate child branch
  • keep leaf child guards unchanged when their own head was not mutated
  • cover the three-PR stack case where the intermediate child must close against the merge commit SHA

Validation

  • uv run --extra dev ruff check control_plane/contracts/merge_train_stack_collapse.py tests/test_merge_train_stack_collapse.py
  • uv run python -m unittest tests.test_merge_train_stack_collapse tests.test_service.LaunchplaneServiceTests.test_merge_train_batch_landing_service_closes_stack_children_after_root_lands
  • uv run python -m unittest tests.test_merge_train_stack_collapse tests.test_merge_train_github tests.test_service

@cbusillo cbusillo merged commit ddee54a into main May 14, 2026
12 checks passed
@cbusillo cbusillo deleted the fix/stack-collapse-child-heads branch May 14, 2026 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant