Skip to content
Snippets Groups Projects
Commit b0241ab0 authored by Henrik tom Wörden's avatar Henrik tom Wörden Committed by I. Nüske
Browse files

FIX: do not use other list if list comparison says lists are equal

parent bf99a124
No related branches found
No related tags found
2 merge requests!159Release 0.16.o,!155Review filter lists and compare_entities
......@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
the contained elements by ID and/or name.
### Changed ###
* `compare_entities` is now case insensitive with respect to property and
recordtype names
* `_ParentList` is now called `ParentList`
* `_Properties` is now called `PropertyList`
* `ParentList.remove` is now case insensitive when a name is used.
......
......@@ -579,8 +579,6 @@ def merge_entities(entity_a: Entity,
else:
same = _same_id_as_resolved_entity(this, that)
if same is True:
setattr(entity_a.get_property(key), attribute,
diff_r2["properties"][key][attribute])
raise_error = False
if raise_error is True:
raise EntityMergeConflictError(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment