From 7e967481935b54ff416d63ba2e8d13eb89d6be65 Mon Sep 17 00:00:00 2001 From: codex-bot-andresmgsl Date: Thu, 27 Aug 2026 10:19:53 +0000 Subject: [PATCH] docs: correct upstream sync campaign record --- changelog.d/269.md | 7 +++++++ docs/UPSTREAM-SYNC.md | 31 +++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 changelog.d/269.md diff --git a/changelog.d/269.md b/changelog.d/269.md new file mode 100644 index 0000000..997f54f --- /dev/null +++ b/changelog.d/269.md @@ -0,0 +1,7 @@ +### Fixed + +- The upstream deferral record now names its floor and a dated measurement instead of a frozen `0.7.4` ceiling that expired before it was written (#269). + +### Changed + +- `docs/UPSTREAM-SYNC.md` now records unconditionally that the next sync campaign merges rather than ports, and so advances the ancestry baseline (#269). diff --git a/docs/UPSTREAM-SYNC.md b/docs/UPSTREAM-SYNC.md index 8f5b40d..a8f133b 100644 --- a/docs/UPSTREAM-SYNC.md +++ b/docs/UPSTREAM-SYNC.md @@ -30,10 +30,33 @@ The ancestry baseline therefore remains the full `.upstream-ref` value `upstream-0.6.x` for upstream's line and bare `0.6.x` for releases cut on this forge. -Upstream's drill-record fixes and the upstream `0.7.0` through `0.7.4` line -remain deferred to the next sync campaign. If that campaign merges rather -than ports, it is the campaign that advances `.upstream-ref`; another port -leaves the ancestry baseline unchanged. +Upstream's drill-record fixes and the upstream `0.7.x` line remain deferred to +the next sync campaign. That line has no ceiling this file can hold still — +upstream tags roughly one release a week — so what is recorded here is its +floor and the date it was last measured: `0.7.0` onward, `0.7.6` newest as +measured 2026-08-27. Run `git ls-remote --tags` for today's ceiling. The +sentence this replaced froze `0.7.4` and was already a release behind on the +day it was written. + +## The next campaign merges + +The next sync campaign is a merge, not a port, and it therefore advances +`.upstream-ref` to the commit it merges. The operator ruled this on #268 on +2026-08-27, when release-init found no forge-local work to fill an `0.6.4` and +opened no window. + +The reason is the ancestry baseline. `.upstream-ref` has been pinned at +`8c3a4d1` — upstream `0.6.0`, merged by #198 — because 0.6.2 came across as a +port and a port moves no ancestry. Another port would leave it pinned and +guarantee a third, larger campaign against a delta that is still growing. + +Size it before starting. With upstream's tags fetched read-only per step 1, +`git diff --shortstat 8c3a4d1dee2bdb5ac06a632a285bb65ab2615214 0.7.6` +was 92 files and +25,121/-971 over 488 commits when measured 2026-08-27, and +the three action scripts the forge delta is heaviest in all move: +`runner-isolated` +1619, `issueflow-reconcile` +913, `labels-reconcile` +889. +Step 4 of the procedure below — the audit of what merged *without* conflicting +— is where that size is actually paid for. ## The standing resolutions