resolve conflicts: #24743 chore: handle legacy duplicate opaque handles - #24885
Closed
PhilWindle wants to merge 1 commit into
Closed
resolve conflicts: #24743 chore: handle legacy duplicate opaque handles#24885PhilWindle wants to merge 1 commit into
PhilWindle wants to merge 1 commit into
Conversation
Collaborator
Author
|
Superseded by #24918 — the v5-next→next backlog is now one time-ordered forward-port PR with a single resolution PR on top, instead of fragmented per-PR pairs (the fragmentation broke commit dependencies). Closing. |
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.
Automated conflict-resolution attempt for #24869 (
fwd-port-24743). Merges next + v5-next PR #24743 ("chore: handle legacy duplicate opaque handles"). Review carefully.What was resolved
yarn-project/kv-store/src/sqlite-opfs/store.tshad committed conflict markers in two hunks:import { quarantineDuplicatePool } from './pool_integrity.js';. Dropped the incomingimport { PoolLockLease, acquirePoolLock, normalizePoolDirectory } from './pool_lock.js';line: that is pre-existing v5 baseline context (from feat: weblock controlled opfs pool #24740's Web Lock work), not part of chore: handle legacy duplicate opaque handles #24743, and next has no pool-lock support.open()body — kept next's structure (worker/store created before thetrywith the 4-arg constructor, singletransferdeclaration) and inserted chore: handle legacy duplicate opaque handles #24743's quarantine block at the top of thetry, keyed off next's existingpoolDirectoryparameter instead of the v5-onlyeffectivePoolDirectory/poolLocklocals.store_management.test.tswas listed as a conflicted file but carried no markers on the branch (added cleanly by the cherry-pick); it was left untouched.Important: this forward-port is incomplete and will not build as-is
PR #24743 was built on top of a v5-only stack that never landed on
next. Onnext,yarn-project/kv-store/src/sqlite-opfs/is missing:pool_lock.ts(providesnormalizePoolDirectory,acquirePoolLock,PoolLockLease)manage.ts(providesdeleteStore,listStores,storePoolDirectory)The cherry-pick added
pool_integrity.tsandstore_management.test.ts, but both import./pool_lock.js(and the test also imports./manage.js), so the package will fail to compile until the underlying weblock/pool-management work (PR #24740 and any siblings) is also forward-ported. Resolving the markers cannot fix this — it needs those modules ported first, or #24743's feature scoped down to whatnextsupports.No generated artifacts were involved; no regeneration required.
Confidence
Low overall. The marker resolution within store.ts is correct and self-consistent, but the branch depends on modules absent from
next, so it needs human judgment on how to complete (or split) the forward-port before it can build/merge.