mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-11 10:06:47 +00:00
Update to latest ifcmerge on Windows
Handle missing IfcRelationship - eg. if all sofas are deleted the IfcRelDefinesByType is deleted too, but we reincarnate as an empty list so it can be merged. Sanity check internal graph - If an entity is deleted in one branch but has a new usage in another branch, merging would break the graph leaving a dangling reference. ie. now you can't delete types, materials etc.. in one branch while using them for new objects in another and still expect the merge to succeed.
This commit is contained in:
+1
-1
@@ -233,7 +233,7 @@ endif
|
||||
|
||||
# required for three-way git merging
|
||||
ifeq ($(PLATFORM), win)
|
||||
cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/2024-06-24/ifcmerge.zip
|
||||
cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/2025-01-26/ifcmerge.zip
|
||||
cd build/bonsai/libs/bin && unzip ifcmerge.zip && rm ifcmerge.zip
|
||||
else
|
||||
cd build/bonsai/libs/bin && wget https://raw.githubusercontent.com/brunopostle/ifcmerge/main/ifcmerge && chmod +x ifcmerge
|
||||
|
||||
Reference in New Issue
Block a user