Deferred: GitHub mirror divergence — preserve, do not force-sync #61
Labels
No labels
R03
research-b
No milestone
No project
No assignees
2 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set
Reference
smolmodelco/thesmolmodelcompany#61
Loading…
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Weekend disposition (2026-09-26): Deferred out of active research work. Read-only fetch confirms GitHub main b01ba3f diverges from the initial canonical snapshot
eb3bbcf: 7 mirror-only / 134 canonical-only commits. This is still a real divergence, not fixed by this closure. Canonical Forgejo remains authoritative; no mirror/public-site publication or destructive ref operation performed. Reopen for a separately scoped publication/reconciliation pass using tree-level comparison and a safe PR, never a force reset. The old proposal to carry mirror-only content back is not adopted without evidence; keep the canonical direction.Historical issue (preserved)
Filed while the Q-E01c workstream is in review; explicitly not blocking anything there.
Measured now (this session, after
git fetch github)github/main)b01ba3f15aaa1dde46af1e576b371d16f5e362f3origin/main)0187b02caeef9d07369ef10130f11120875f14a577aa43b77e23f2a0b7978ef6495af7ae377164begit merge-base --is-ancestor <mirror-tip> origin/mainmaingit rev-list --count <mirror-tip>..origin/maingit rev-list --count origin/main..<mirror-tip>The second count is the one that matters: 7 commits exist on the mirror and not on canonical
main, so this is divergence, not lag, and a push cannot reconcile it.The 7 mirror-side commits
At least the last five are mirror-side content (
#8–#12) whose status on canonicalmainis not established by the counts above — some may already be present under different SHAs, some may be genuinely mirror-only. That is the question a reconciliation has to answer before anything is pushed in either direction.What was and was not done
--force, no--force-with-lease, no direct push to either default branch, and no local refs moved. The mirror refs here are read-only fetches.docs/forgejo-workflow.md), which is why this is filed as its own change rather than folded into a run PR.Proposed scope for whoever takes it
mainunder another SHA, (b) worth carrying back, or (c) superseded — with the file-level comparison, not the subject lines, as the evidence.main; then re-sync the mirror by its own workflow.If the operator would rather the mirror track canonical mechanically (reset-and-replay on each merge), that is a policy call for decision 0003's own document and a cheaper long-term answer than repeated manual reconciliation — raising it here rather than assuming it.
Weekend research-lead disposition (2026-09-26)
Deferred out of active research work. Read-only fetch confirms GitHub main b01ba3f diverges from the initial canonical snapshot
eb3bbcf: 7 mirror-only / 134 canonical-only commits. This is still a real divergence, not fixed by this closure. Canonical Forgejo remains authoritative; no mirror/public-site publication or destructive ref operation performed. Reopen for a separately scoped publication/reconciliation pass using tree-level comparison and a safe PR, never a force reset. The old proposal to carry mirror-only content back is not adopted without evidence; keep the canonical direction.Reconcile the public GitHub mirror: it has diverged from canonical main, not merely laggedto Deferred: GitHub mirror divergence — preserve, do not force-sync