Skip to content

[codex] Add WP object edit-delete merge smoke coverage#212

Merged
adamziel merged 1 commit into
trunkfrom
codex/wp-comment-edit-delete-smoke
May 16, 2026
Merged

[codex] Add WP object edit-delete merge smoke coverage#212
adamziel merged 1 commit into
trunkfrom
codex/wp-comment-edit-delete-smoke

Conversation

@adamziel
Copy link
Copy Markdown
Contributor

@adamziel adamziel commented May 16, 2026

What it does

Adds fast COW merge smoke regressions for two WordPress object graphs where the source branch edits an object while the target branch deletes it:

  • wp_comments plus wp_commentmeta
  • a CPT-like forkpress_note graph across wp_posts, wp_postmeta, wp_options, and wp_term_relationships

It also updates the merge reliability matrix to record the v0.1.28 release gate and the new edit/delete coverage.

Rationale

The smoke suite already covered create/create merges and edit/delete conflicts for reusable blocks, menus, and attachments. Comments and CPT rows are also complete WordPress object graphs. These cases should stay reviewable and preserve the target deletion before review instead of silently resurrecting target-deleted content.

Implementation

The new fixtures assert:

  • completed_with_conflicts for source-edit/target-delete graph races
  • target deletion is preserved before review
  • each changed source row records a row-target-deleted conflict
  • default decisions are target-wins until a reviewer resolves the conflict

Testing instructions

php -l tests/cow/merge_smoke.php
git diff --check
make test-cow-merge-smoke

@adamziel adamziel force-pushed the codex/wp-comment-edit-delete-smoke branch from cb132a2 to a8b145e Compare May 16, 2026 18:51
@adamziel adamziel changed the title [codex] Add comment edit-delete merge smoke coverage [codex] Add WP object edit-delete merge smoke coverage May 16, 2026
@adamziel adamziel merged commit fc9cebf into trunk May 16, 2026
6 checks passed
@adamziel adamziel deleted the codex/wp-comment-edit-delete-smoke branch May 16, 2026 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants