Repository navigation
[claude] Test that FwHeadless merges divergent hg heads with chorusmerge - #2987
Merged
Merged
Conversation
…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>
Contributor
|
Warning Review limit reachedYou'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. View limit details
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. |
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>
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.
[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).
git merge-filecheck on the same edits; relies on the CI integration job.🤖 Generated with Claude Code