From b0241ab0637cb7d0107f9203fbb771c9b6ad64cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Wed, 30 Oct 2024 11:10:20 +0100
Subject: [PATCH] FIX: do not use other list if list comparison says lists are
equal
---
CHANGELOG.md | 2 ++
src/linkahead/apiutils.py | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3858a9c..55fea8e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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.
diff --git a/src/linkahead/apiutils.py b/src/linkahead/apiutils.py
index 7ffd8ebb..5e25e3f5 100644
--- a/src/linkahead/apiutils.py
+++ b/src/linkahead/apiutils.py
@@ -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(
--
GitLab