From afcc95fbbd2cc864a363b3defdc533f49e63b5b6 Mon Sep 17 00:00:00 2001 From: codex-bot-andresmgsl Date: Mon, 24 Aug 2026 00:35:16 +0000 Subject: [PATCH] docs: record upstream 0.6.3 sync baseline --- changelog.d/231.md | 7 +++++++ docs/UPSTREAM-SYNC.md | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 changelog.d/231.md diff --git a/changelog.d/231.md b/changelog.d/231.md new file mode 100644 index 0000000..aff9c1c --- /dev/null +++ b/changelog.d/231.md @@ -0,0 +1,7 @@ +### Changed + +- Forge release 0.6.2 consolidates upstream 0.6.1 doctrine from upstream #316, #311, #330, and #329, plus upstream 0.6.2's #336 clarification (#231). + +- Upstream 0.6.3's #343 membership record and #327 gate fixes land through Forgejo-adapted reconciler changes rather than upstream bytes (#231). + +- The upstream drill-record fixes at `86dc2eb`, `a72085b`, and `13ffb0d`, plus upstream 0.7.0–0.7.4, remain explicitly deferred (#231). diff --git a/docs/UPSTREAM-SYNC.md b/docs/UPSTREAM-SYNC.md index 84bbd8b..b5b1a4c 100644 --- a/docs/UPSTREAM-SYNC.md +++ b/docs/UPSTREAM-SYNC.md @@ -17,6 +17,27 @@ 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. +## Sync ledger + +### 2026-08-24 — upstream 0.6.1–0.6.3 into forge 0.6.2 + +- **Consumed through:** upstream tag `upstream-0.6.3` + (`cf2892148305ab18ff234fa0a2ef28ab6fef6c0f`). The `upstream-` prefix is + mandatory in this record because bare `0.6.x` names collide with this + forge's own releases and can identify different trees. +- **Previous baseline:** upstream `0.6.0`, merge-base + `8c3a4d1dee2bdb5ac06a632a285bb65ab2615214`. This adoption ported the + upstream changes in #229 and #230 instead of merging upstream ancestry, so + `.upstream-ref` and the Git merge-base intentionally remain at that commit; + `upstream-0.6.3` is the new content baseline for the next campaign. +- **Adapted here:** the membership and gate changes were applied to the + Forgejo reconciler and its tests, and the upstream CONTRIBUTING changes + were reconciled with this forge's roster and conventions rather than copied + byte-for-byte. +- **Deferred:** upstream's drill-record bookkeeping commits `86dc2eb`, + `a72085b`, and `13ffb0d` correct drill files this forge does not mirror. + Upstream 0.7.0–0.7.4 is the next sync campaign's standing queue. + ## The standing resolutions These recur every sync. They are decided; re-deciding them is the cost this