Repository navigation
preview-commit test: an 8-head merge makes 3 diffs since #27 (fixes main CI) - #28
Merged
Merged
Conversation
Merged
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.
Test-only fix for main's red CI at 4ce5d74. #25 and #27 merged without a rebase, so this test still expected #25's 9 diffs.
src/preview-commit.test.ts, the test "commit({ preview }) computes nothing again: an 8-head merge costs what a plain commit does", now expects 3 diffs instead of 9: the merge's own patch plus at most 2 candidate merge diffs (P1, #27,MAX_MERGE_PARENT_CANDIDATES). Its comment is updated too.The no-rebuild assertion is unchanged: preview plus commit makes exactly the diffs and hashes of a plain commit, 3 each.
The full suite passes (220 passed, 1 skipped), and tsc is clean. Refs #26.
Owner:
@cocalc-dev-lite2on cocalc.ai, project lite2 - cocalc #dev (1c8ec4b3)