Automation: main-next integrate #18484
Closed
Conversation
This file contains 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
## Description This error event is currently the noisiest and I don't believe it is actionable as an error. Not sure of its usefulness, but I would leave it as a regular telemetry event to maybe help with future investigations by correlating with other signals.
## Description This PR fixes a bug that resulted in the prune algorithm in PropertyDDS to prune remoteChanges but keep the associated unrebasedChanges when generating a summary. This could later result in rebase errors for clients that would join using this summary as a starting point. The problem would occur, when a summarizer has several remote changes in its history, but the MSN points to a state before the first of these changes. In that case, none of those can yet be removed, but the old implementation would incorrectly handle this case and remove the remote change, but keep the unrebasedChanges. ## Breaking Changes This change only affects the summarizer and thus will not cause any incompatibility between clients with different versions.
## Description This adds a suite to exhaustively test rebasing over sequence changesets. The test suite is checked in skipped (assuming edit generation is correct): - The recently added `verifyComposeAssociativity` check in the `Composed sandwich rebase over single edit` suite fails for every combination of edits. If the check is skipped, there are still a large number of failing tests. ## Reviewer Guidance The review process is outlined on [this wiki page](https://github.com/microsoft/FluidFramework/wiki/PR-Guidelines#guidelines). The test suite is probably too long as written currently and I'm looking for feedback as to how to reduce its running time. --------- Co-authored-by: Yann Achard <[email protected]>
|
opening a new pr |
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.
main-next integrate PR
DO NOT MERGE THIS PR USING THE GITHUB UI.
The aim of this pull request is to sync main and next branch. If this PR is assigned to you, you need to do the following:
git commit --amend -m "Automation: main-next integrate"git push --force-with-leaseOnce CI passes and the PR is ready to merge, add the "msftbot: merge-next" label to the PR and one of the people with merge permissions will merge it in.