From 711bb301767f9a1e108828fe288a4fb290a6aa0b Mon Sep 17 00:00:00 2001 From: garrytan Date: Sun, 1 Nov 2026 17:05:05 +0000 Subject: [PATCH] docs: changelog fragment for the GST-770 wave plan follow-up and #3558 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- changelog.d/fix-gst-770-wave-followup.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelog.d/fix-gst-770-wave-followup.md diff --git a/changelog.d/fix-gst-770-wave-followup.md b/changelog.d/fix-gst-770-wave-followup.md new file mode 100644 index 000000000..3db6c9c45 --- /dev/null +++ b/changelog.d/fix-gst-770-wave-followup.md @@ -0,0 +1,4 @@ +- `gstack-ship-queue wave plan` now leaves out a READY head that does not merge onto main. It prints `NOT_MERGEABLE: # (...)` with the conflicting files, the same way `NOT_GREEN` works for red CI. A conflict only in the CHANGELOG doesn't count, since the train merges those. Before, such a head was planned into a wave and the wave build stopped on it. +- A PR that renames a file and a PR that edits the old path are now linked into one wave group when the edit conflicts with the rename. Before, the conflict was reported at the new path, which the editing PR never touched, so the two ended up in different waves. +- Linked PRs are never split across waves anymore. A group of linked PRs larger than the wave size prints `WAVE_OVERSIZE` with no build command and stays whole. Before, the packer cut such a group at the wave size, so its conflict reached two integrators. +- `gstack-ship-queue ready` reports `STAMP_VERSION=unstamped` for a PR whose own changes leave VERSION alone, even after main moves to a newer version. Before, it compared the head with current main, so an unstamped PR showed its old version as a stamp (#3804 showed 1.92.30.0 while main was 1.92.32.0; #3558).