Skip to content
Snippets Groups Projects

F copy entity

Merged Alexander Schlemmer requested to merge f-copy-entity into dev
1 unresolved thread
3 files
+ 176
7
Compare changes
  • Side-by-side
  • Inline

Files

+ 7
7
@@ -742,13 +742,13 @@ def merge_entities(entity_a: Entity, entity_b: Entity):
else:
raise RuntimeError("Merge conflict.")
else:
# TODO: This is a temporary FIX for
# https://gitlab.indiscale.com/caosdb/src/caosdb-pylib/-/issues/105
entity_a.add_property(id=entity_b.get_property(key).id,
name=entity_b.get_property(key).name,
datatype=entity_b.get_property(key).datatype,
value=entity_b.get_property(key).value,
importance=entity_b.get_importance(key))
# TODO: This is a temporary FIX for
# https://gitlab.indiscale.com/caosdb/src/caosdb-pylib/-/issues/105
entity_a.add_property(id=entity_b.get_property(key).id,
name=entity_b.get_property(key).name,
datatype=entity_b.get_property(key).datatype,
value=entity_b.get_property(key).value,
importance=entity_b.get_importance(key))
# entity_a.add_property(
# entity_b.get_property(key),
# importance=entity_b.get_importance(key))
Loading