toasterson/Anima
Watch
0
0
Fork
You've already forked Anima
 0
Code Issues 1 Pull requests 86 Projects Releases Packages Wiki Activity Actions

Batch immutable ancestry reads for historical merge reconciliation #785

Open
toasterson wants to merge 2 commits from fix/external-merge-batch-20261007 into main
pull from: fix/external-merge-batch-20261007
merge into: toasterson:main
Conversation 0 Commits 2 Files changed 3 +326 -35
toasterson commented 2026-10-07 06:39:49 +00:00
Owner
Copy link

Older merged work could remain open because external-merge verification fetched one commit at a time and exceeded its 30-second deadline. Fetch bounded parent-graph batches and search connected cached paths before expanding side histories, while retaining positive parent-edge proof, exact identities, graph limits, conflict detection, and all existing lifecycle guards.

WI-917: https://anima.wegmueller.it/work-items/01a11508-dd10-7f12-b469-f69db7d9892a
Field case: Akh-Medu WI-305 / PR339. A read-only probe of the revised algorithm proved both ancestry paths in 7 requests / 5.013 seconds; this is not a deployed-server acceptance result.

Validation: 6 ancestry regression tests and 8 actual PostgreSQL lifecycle tests passed; strict Clippy passed for both affected libraries and the integration target. Covers deep history, cached alternate-parent proof, malformed/oversized/conflicting responses, unrelated commits, graph bounds, retained ownership, acceptance locking, idempotency, and unchanged audit/gate evidence.

Native review and CI remain required before merge. No deployment is included.

Older merged work could remain open because external-merge verification fetched one commit at a time and exceeded its 30-second deadline. Fetch bounded parent-graph batches and search connected cached paths before expanding side histories, while retaining positive parent-edge proof, exact identities, graph limits, conflict detection, and all existing lifecycle guards. WI-917: https://anima.wegmueller.it/work-items/01a11508-dd10-7f12-b469-f69db7d9892a Field case: Akh-Medu WI-305 / PR339. A read-only probe of the revised algorithm proved both ancestry paths in 7 requests / 5.013 seconds; this is not a deployed-server acceptance result. Validation: 6 ancestry regression tests and 8 actual PostgreSQL lifecycle tests passed; strict Clippy passed for both affected libraries and the integration target. Covers deep history, cached alternate-parent proof, malformed/oversized/conflicting responses, unrelated commits, graph bounds, retained ownership, acceptance locking, idempotency, and unchanged audit/gate evidence. Native review and CI remain required before merge. No deployment is included.
Search cached connected paths before expanding merge side histories
Some checks failed
CI / conflict-check (push) Failing after 19m23s
Details
CI / test (push) Failing after 1h15m55s
Details
be817ca9f3
Some checks failed
CI / conflict-check (push) Failing after 19m23s
Details
CI / test (push) Failing after 1h15m55s
Details
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin fix/external-merge-batch-20261007:fix/external-merge-batch-20261007
git switch fix/external-merge-batch-20261007

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff fix/external-merge-batch-20261007
git switch fix/external-merge-batch-20261007
git rebase main
git switch main
git merge --ff-only fix/external-merge-batch-20261007
git switch fix/external-merge-batch-20261007
git rebase main
git switch main
git merge --no-ff fix/external-merge-batch-20261007
git switch main
git merge --squash fix/external-merge-batch-20261007
git switch main
git merge --ff-only fix/external-merge-batch-20261007
git switch main
git merge fix/external-merge-batch-20261007
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Compat/Breaking
Breaking change that won't be backward compatible

  
Kind/Bug
Something is not working

  
Kind/Documentation
Documentation changes

  
Kind/Enhancement
Improve existing functionality

  
Kind/Feature
New functionality

  
Kind/Security
This is security issue

  
Kind/Testing
Issue or pull request related to testing

  
Priority
Critical
 The priority is critical

  
Priority
High
 The priority is high

  
Priority
Low
 The priority is low

  
Priority
Medium
 The priority is medium

  
Reviewed
Confirmed
 Issue has been confirmed

  
Reviewed
Duplicate
 This issue or pull request already exists

  
Reviewed
Invalid
 Invalid issue

  
Reviewed
Won't Fix
 This issue won't be fixed

  
Status
Abandoned
 Somebody has started to work on this but abandoned work

  
Status
Blocked
 Something is blocking this issue or pull request

  
Status
Need More Info
 Feedback is required to reproduce issue or to continue work

No labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
toasterson/Anima!785
No description provided.