From 900cb2ba859855f21c483cdb1b0a0cbd630ec2f9 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 20f2498a..92ecc008 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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 ###
 
diff --git a/src/linkahead/apiutils.py b/src/linkahead/apiutils.py
index b2a612fa..71ec3d45 100644
--- a/src/linkahead/apiutils.py
+++ b/src/linkahead/apiutils.py
@@ -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(
-- 
GitLab