Skip to content
Snippets Groups Projects

F doc ref properties

Merged Florian Spreckelsen requested to merge f-doc-ref-properties into dev
3 unresolved threads
7 files
+ 18
9
Compare changes
  • Side-by-side
  • Inline

Files

+ 3
1
@@ -43,6 +43,8 @@ from caosdb.common.models import (Container, Entity, File, Property, Query,
get_config, SPECIAL_ATTRIBUTES)
from caosdb.exceptions import CaosDBException
logger = logging.getLogger(__name__)
class EntityMergeConflictError(CaosDBException):
"""An error that is raised in case of an unresolvable conflict when merging
@@ -413,7 +415,7 @@ def merge_entities(entity_a: Entity, entity_b: Entity, merge_references_with_emp
"""
logging.warning(
logger.warning(
"This function is currently experimental and insufficiently tested. Use with care.")
# Compare both entities:
Loading