Catch-up: sync missing v1.5.8 + v1.5.9 changes to public repo#5
Merged
Conversation
The earlier PRs #3 (v1.5.8) and #4 (v1.5.9) both landed the OSS-side work but silently dropped 8 files during the sync + branch + commit flow. shop/main has the correct content since those tags were cut, but the public tree has been running stale on: - CHANGELOG.md — v1.5.8 + v1.5.9 entries were missing (public still showed v1.5.7 at top) - core/version.py — stuck at 1.5.7 (should be 1.5.9) - cart/models.py, cart/views.py — v1.5.9 storefront add-to-cart / guest wishlist regression fixes - core/api/help_views.py, core/services/semantic_search.py — v1.5.9 admin help search 500 fix (unquoted numeric YAML in help frontmatter) - core/settings.py — v1.5.9 hourly cleanup-expired-parked-carts beat schedule (plus any settings drift between 1.5.7 and 1.5.9) - core/fixtures/help_embeddings.jsonl.gz — regenerated embeddings for the backfilled voucher / hosted-services / POS help topics Files were copied verbatim from git-archive of shop@v1.5.9 (same source the earlier syncs should have used). Blocklist rules unchanged; verified no forbidden strings. Root cause of the earlier drops is under investigation — likely a race in the sync-to-open + branch + commit flow that reset the working tree back to origin/main state after the sync rsync'd new content. Follow-up work will harden the sync script. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Dayyan James <dayyan.james@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What / why
PRs #3 and #4 landed the OSS-side transitions but silently dropped 8
files during their sync + branch + commit flows.
shop/mainatv1.5.9has always had the correct content — the public tree hasbeen running stale.
Impact: the public repo has claimed to be v1.5.9 in its Release
notes since the v1.5.9 tag was cut, but the
CHANGELOG.mdstillshows v1.5.7 at the top,
core/version.pystill says 1.5.7, andseveral v1.5.9 bug fixes are simply absent (storefront add-to-cart
500, guest wishlist 401, admin help search 500, POS parked-cart beat
schedule).
How
Copied 8 files verbatim from
git archive shop@v1.5.9, the samesource the earlier syncs should have used:
CHANGELOG.md— restores v1.5.8 + v1.5.9 entriescore/version.py— 1.5.7 → 1.5.9cart/models.py(+51 lines),cart/views.py(+12 lines) —v1.5.9 storefront regression fixes
core/api/help_views.py,core/services/semantic_search.py—v1.5.9 admin help search 500 fix
core/settings.py(+15 lines) — v1.5.9 parked-cart cleanupcore/fixtures/help_embeddings.jsonl.gz— regenerated embeddingsfor backfilled help topics
Sync-script blocklist rules unchanged; no forbidden strings surfaced.
Root cause of the earlier drops is under investigation — likely a
race in sync-to-open + branch + commit that reset the working tree
back to
origin/mainstate after the sync rsync'd new content. Aharder-to-corrupt sync flow will follow.
Test plan
HEAD — only these 8 files differ
Only in scratch= 0)Only in targetfiltered to .git only)Local tests already ran against these files at v1.5.8 / v1.5.9 tag
time (166 tests pass); CI will re-verify on this branch.
Checklist
git commit -s)<style>or<script>Screenshots
None.
Related issues
Follow-up post-mortem needed on the sync workflow so this doesn't
recur.