Compare commits

..

No commits in common. "f5c02fee8f3bdbd1c698d9d1d355e539d6fb3de0" and "bcbcd900479c589f59897e0320b77abbaa4609f0" have entirely different histories.

2 changed files with 4 additions and 34 deletions

View file

@ -1,7 +0,0 @@
### 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).

View file

@ -30,33 +30,10 @@ 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 `upstream-0.6.x` for upstream's line and bare `0.6.x` for releases cut on this
forge. forge.
Upstream's drill-record fixes and the upstream `0.7.x` line remain deferred to Upstream's drill-record fixes and the upstream `0.7.0` through `0.7.4` line
the next sync campaign. That line has no ceiling this file can hold still — remain deferred to the next sync campaign. If that campaign merges rather
upstream tags roughly one release a week — so what is recorded here is its than ports, it is the campaign that advances `.upstream-ref`; another port
floor and the date it was last measured: `0.7.0` onward, `0.7.6` newest as leaves the ancestry baseline unchanged.
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 ## The standing resolutions