Skip to content

[UPSTREAM-SYNC] state: clear stale catchup_in_progress; record release_sync v2026.9.24 #3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Da-Mikey wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[UPSTREAM-SYNC] state: clear stale catchup_in_progress; record release_sync v2026.9.24 #3442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions .evolution/upstream-sync-state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
"synced_at": "2026-06-13",
"deferred": [],
"_note": "synced_through_commit is the LOGICAL cursor: the upstream commit through which evolution-upstream-sync has ACCOUNTED for every commit (applied OR deferred). Each run processes the next <=25 commits AFTER it (oldest-first) and advances it \u2014 so nothing in the window is ever silently skipped. Seeded to the merge-base of our main and upstream/main (the honest contiguous synced point). synced_through_tag/date = newest upstream release tag that is an ancestor of the cursor (mirrored into __release_date__ for the banner); they advance ONLY when the cursor crosses a new tag. deferred[] records commits evaluated but not applied (conflict/irrelevant) with reasons, for owner review.",
"catchup_in_progress": {
"branch": "sync/upstream-catchup",
"pr": 1641,
"issue": 1526,
"target_tag": "v2026.7.30",
"then": "v2026.8.3",
"phase_1": "complete \u2014 4665 files of non-conflicting upstream change",
"phase_2": "6 of 87 deferred files integrated",
"_warning": "A bulk catch-up is running on the branch above, walking upstream RELEASE TAGS. It is a different mechanism from this file's 25-commit cursor. Do not advance synced_through_commit from the incremental sync while this is open \u2014 the two would each think they had applied commits the other actually applied, and the cursor would claim coverage that main does not have. Resume the incremental sync only after PR #1641 merges, reseeding the cursor to the new merge-base."
"release_sync": {
"mode": "release-track",
"integrated_tag": "v2026.9.24",
"integrated_version": "0.21.5",
"pr": 3436,
"merge_commit": "3f3ee4a1a0a703f9161d12d82161ffa25e917046",
"merged_at": "2026-09-29T17:47:15Z",
"verified": "git merge-base --is-ancestor v2026.9.24 origin/main -> true; git rev-list --count main..v2026.9.24 = 0",
"checked_at": "2026-10-01",
"_note": "Release-track merges (upstream RELEASE TAGS merged into a sync/upstream-release-* branch + PR, owner-gated) are recorded HERE, not in synced_through_commit: the incremental 25-commit cursor is not advanced by release merges. Stale catchup_in_progress block removed 2026-10-01 (its PR #1641 merged 2026-08-04 and branch sync/upstream-catchup no longer exists on origin)."
}
}
}
Loading