Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-pylib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-pylib
Commits
b0241ab0
Commit
b0241ab0
authored
5 months ago
by
Henrik tom Wörden
Committed by
I. Nüske
5 months ago
Browse files
Options
Downloads
Patches
Plain Diff
FIX: do not use other list if list comparison says lists are equal
parent
bf99a124
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!159
Release 0.16.o
,
!155
Review filter lists and compare_entities
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+2
-0
2 additions, 0 deletions
CHANGELOG.md
src/linkahead/apiutils.py
+0
-2
0 additions, 2 deletions
src/linkahead/apiutils.py
with
2 additions
and
2 deletions
CHANGELOG.md
+
2
−
0
View file @
b0241ab0
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
src/linkahead/apiutils.py
+
0
−
2
View file @
b0241ab0
...
...
@@ -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
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment