Skip to content

[claude] Test that FwHeadless merges divergent hg heads with chorusmerge - #2987

Merged
myieye merged 4 commits into
developfrom
claude/fwheadless-two-heads-merge-test-23d44c
Nov 18, 2026
Merged

myieye merged 4 commits into
developfrom
claude/fwheadless-two-heads-merge-test-23d44c

Conversation

@myieye

@myieye myieye commented Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator

[Claude, autonomous]

Adds an integration test where two clones push items inserted at the same spot in PartsOfSpeech.list, and FwHeadless's closing S/R must merge them with the real chorusmerge. A text merge conflicts there and the #2508 whole-file fallback drops one side, so only chorusmerge with the FieldWorks plugin passes (guards runtime upgrades like #2549).

  • Asserts 2 heads before the sync, then 1 head that is a merge commit containing both items.
  • Not verified locally: built only, plus a manual ChorusMerge vs git merge-file check on the same edits; relies on the CI integration job.

🤖 Generated with Claude Code

…horusmerge

Two clones push competing edits to PartsOfSpeech.list, then a CRDT change
forces a closing S/R, whose merge must keep both edits. Covers the real
chorusmerge path (plugin discovery, runtime roll-forward, FwHeadless user)
that the Dockerfile smoke test only runs as root.

Moves the create-entry CRDT commit helper into FwHeadlessTestHelpers.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 32 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Repository UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: e024044c-4f68-48bf-8da7-ce5844f31292
Commits

Reviewing files that changed from the base of the PR and between 290b9a2 and 6a2d18c.

Files selected for processing: 3

  • backend/Testing/FwHeadless/ChorusMergeTests.cs
  • backend/Testing/FwHeadless/FwHeadlessTestHelpers.cs
  • backend/Testing/FwHeadless/MergeFwDataWithHarmonyTests.cs
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@github-actions github-actions Bot added the 📦 Lexbox issues related to any server side code, fw-headless included label Nov 16, 2026
myieye and others added 3 commits November 16, 2026 14:24
Both clones now add a part of speech at the same spot, which a line-based
merge reports as a conflict but Chorus's XML merge keeps. Also assert the
branch head is a merge commit.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
FLExBridge validates split files at commit and, from model 7000066 on,
rejects objects missing a basic property (SortSpec failed first), which
rolled back the closing S/R before any merge.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…o FwData

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@myieye
myieye merged commit e82558e into develop Nov 18, 2026
30 checks passed
@myieye
myieye deleted the claude/fwheadless-two-heads-merge-test-23d44c branch November 18, 2026 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📦 Lexbox issues related to any server side code, fw-headless included

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant