Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ignore_changes converting null maps to empty maps, and applying marks. #29928

Merged
merged 2 commits into from Nov 12, 2021

Conversation

jbardin
Copy link
Member

@jbardin jbardin commented Nov 11, 2021

When processing nested data structures for ignore_changes, a null map was sometimes converted to an empty map.

When processing individual changes within a map, those changes could be lost when re-applying any marks set on the outer map.

Fixes #29921

Fix an error where using `ignore_changes` would cause some null maps to
be saved as an empty map.
Add a test to ensure ignore_changes does not change null maps to empty
maps.

Fix when a marked map revers the changes ignored within that map.
@jbardin jbardin added the 1.1-backport If you add this label to a PR before merging, backport-assistant will open a new PR once merged label Nov 11, 2021
@jbardin jbardin requested a review from a team November 11, 2021 15:50
@jbardin jbardin self-assigned this Nov 11, 2021
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
1.1-backport If you add this label to a PR before merging, backport-assistant will open a new PR once merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ignore_changes causes nil map to be empty map
2 participants