Skip to content
Snippets Groups Projects
Commit 35770175 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

fix

parent 32076776
No related branches found
No related tags found
2 merge requests!178FIX: #96 Better error output for crawl.py script.,!167Sync Graph
Pipeline #51565 failed
...@@ -117,7 +117,10 @@ class SyncNode: ...@@ -117,7 +117,10 @@ class SyncNode:
raise ImpossibleMergeError( raise ImpossibleMergeError(
f"Trying to update {attr} but this would lead to an " f"Trying to update {attr} but this would lead to an "
f"override of the value '{self.__getattribute__(attr)}' " f"override of the value '{self.__getattribute__(attr)}' "
f"by the value '{other.__getattribute__(attr)}'") f"by the value '{other.__getattribute__(attr)}'",
pname=attr, values=(self.__getattribute__(attr),
other.__getattribute__(attr))
)
for p in other.parents: for p in other.parents:
if not parent_in_list(p, self.parents): if not parent_in_list(p, self.parents):
self.parents.append(p) self.parents.append(p)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment