From 1680c3135a50e2ac1a45e7c9e28c94afdf36be59 Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Fri, 31 Jan 2025 15:05:34 +0000 Subject: [PATCH] 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. --- src/bonsai/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bonsai/Makefile b/src/bonsai/Makefile index 554e29efff..99387689f5 100644 --- a/src/bonsai/Makefile +++ b/src/bonsai/Makefile @@ -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