This repository was archived by the owner on Nov 25, 2024. It is now read-only.
Resolve over old and new extremities #2457
Merged
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.
Combined with matrix-org/gomatrixserverlib#308, I am rather hoping that this will fix some of the more painful state resets that we have seen happening recently. The latest events updater will now feed in both the state after the old extremities and the state after the new extremities into state res, so that if there are bad state snapshots being brought into the new extremities, we shouldn't lose all of the old state and should hopefully end up resolving the correct state either way.