From fdb7d7577b4b30c11f2db9b47f278e2a16783c8c Mon Sep 17 00:00:00 2001 From: codex-bot-andresmgsl Date: Mon, 24 Aug 2026 13:23:54 +0000 Subject: [PATCH] docs: record 0.6.2 upstream port provenance --- CHANGELOG.md | 8 ++++---- docs/UPSTREAM-SYNC.md | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c201cc..a3cb9cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,10 +17,10 @@ This tree is `heavy-duty/ceremony` on numbers (#197 D2). Two trees therefore answer to the same number, differing by the forge-compatibility delta. **This tree carries upstream through `8c3a4d1`** (upstream `0.6.0`, merged by #198); the `0.4.1` section below is -this forge's own release, not upstream's, and upstream's separate `0.4.1` -section is deliberately not carried — the tag published here is the one this -section is the body of. Each sync updates this line -(docs/UPSTREAM-SYNC.md, #200). +this forge's own release, not upstream's, and upstream `0.6.1` through `0.6.3` +were adopted by port rather than merge. Upstream's separate `0.4.1` section +is deliberately not carried — the tag published here is the one this section +is the body of. Each sync updates this line (docs/UPSTREAM-SYNC.md, #200). ## 0.6.2 — 2026-08-24 diff --git a/docs/UPSTREAM-SYNC.md b/docs/UPSTREAM-SYNC.md index 84bbd8b..8f5b40d 100644 --- a/docs/UPSTREAM-SYNC.md +++ b/docs/UPSTREAM-SYNC.md @@ -17,6 +17,24 @@ resolution is standing and does not get re-decided each sync. Worked example throughout: the `0.6.0` sync (#197, #198), which merged upstream `8c3a4d1` onto `dad99dd` and took four heads to get green. +## 0.6.2 port record + +On 2026-08-24 this tree released the content carried by upstream +`upstream-0.6.1` through `upstream-0.6.3`. The content baseline is +`upstream-0.6.3`; the changes were ported onto the Forgejo-adapted tree by +#229 and #230 rather than merged from upstream. + +The ancestry baseline therefore remains the full `.upstream-ref` value +`8c3a4d1dee2bdb5ac06a632a285bb65ab2615214` (upstream `0.6.0`, merged by +#198). No upstream ancestry moved in this release. Tags are disambiguated as +`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. + ## The standing resolutions These recur every sync. They are decided; re-deciding them is the cost this