apply_change_to_project: Fix removal of simple value that's nil already. #16
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
Closed
ashdnazg
approved these changes
Jul 11, 2021
| @@ -218,7 +219,7 @@ def apply_addition_to_simple_attribute(old_value, change) | |||
| new_value = old_value.merge(change) | |||
|
|
|||
| unless (old_value.to_a - new_value.to_a).empty? | |||
| raise "New hash #{change} contains values that conflict with old hash #{old_value}" | |||
| raise "New hash #{change} contains values that conflicts with old hash #{old_value}" | |||
There was a problem hiding this comment.
values is plural, so conflict is correct
If the applied change removed a value and the existing value is different from the removed value, it is considered a conflict. However, this is not true in the case the existing value was already removed. In addition, improve messages in case of real conflicts when dealing with removal of simple attributes.
byohay
force-pushed
the
feature/kintsugi-removal-raise
branch
from
0a07723 to
7c417ec
Compare
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.
If the applied change removed a value and the existing value is
different from the removed value, it is considered a conflict.
However, this is not true in the case the existing value was already
removed.
In addition, improve messages in case of real conflicts when dealing
with removal of simple attributes.