Skip to content
Snippets Groups Projects
Commit 900cb2ba authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

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

parent 1faa79e7
No related branches found
No related tags found
1 merge request!182Draft: FIX: do not replace prop during merge
Pipeline #62419 canceled
......@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- convenience functions `value_matches_versionid`, `get_id_from_versionid` and `get_versionid`
### Changed ###
- `compare_entities` is now case insensitive with respect to property and
recordtype names
### Deprecated ###
......
......@@ -615,8 +615,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