Repository navigation
Conversation
This branch has not been deployed
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
1 participant
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.
This matches the prototype and avoids introducing and handling the special case of structurally empty trees.
In fact, we never had union levels with a structurally empty merging tree in the first place. Structurally empty trees only existed as intermediate values in
unionsInOpenSession, where we now usingNothinginstead. Therefore, the snapshot format does not need to change. Old snapshots can be parsed without issues, as they don't contain structurally empty trees.The
SnapPendingMergetype could enforce these invariants statically by usingNonEmpty. However this would caused some more code churn, so I abandoned it for now. Let me know if you think it's worth pursuing.Before merging, I'd like to do some squashing and add documentation to code and commit messages.