diff -U2 -r /var/lib/copr-rpmbuild/results/IfcOpenShell/upstream-unpacked/Source1/ifcmerge /var/lib/copr-rpmbuild/results/IfcOpenShell/srpm-unpacked/ifcmerge-extract/ifcmerge --- /var/lib/copr-rpmbuild/results/IfcOpenShell/upstream-unpacked/Source1/ifcmerge 2025-01-26 21:38:01.466068676 +0000 +++ /var/lib/copr-rpmbuild/results/IfcOpenShell/srpm-unpacked/ifcmerge-extract/ifcmerge 2025-01-26 21:38:01.484068934 +0000 @@ -74,17 +74,5 @@ if (defined $remote->{modified}->{$id}) { - my ($remote_class) = $remote->class_attributes($id); - if ($remote_class =~ /^IfcRel/i) - { - # IfcRelationship may be deleted overzealously, reinsert empty - $local->{file}->{$id} = $remote->{file}->{$id}; - $local->{file}->{$id} =~ s/\([0-9#,]+\)/\(\)/; - delete $local->{deleted}->{$id}; - $local->{modified}->{$id} = 1; - } - else - { - push @errors, "$ARGV[1] deleted entity #$id modified in $ARGV[2]!"; - } + push @errors, "$ARGV[1] deleted entity #$id modified in $ARGV[2]!"; } else @@ -97,17 +85,5 @@ if (defined $local->{modified}->{$id}) { - my ($local_class) = $local->class_attributes($id); - if ($local_class =~ /^IfcRel/i) - { - # IfcRelationship may be deleted overzealously, reinsert empty - $remote->{file}->{$id} = $local->{file}->{$id}; - $remote->{file}->{$id} =~ s/\([0-9#,]+\)/\(\)/; - delete $remote->{deleted}->{$id}; - $remote->{modified}->{$id} = 1; - } - else - { - push @errors, "$ARGV[2] deleted entity #$id modified in $ARGV[1]!"; - } + push @errors, "$ARGV[2] deleted entity #$id modified in $ARGV[1]!"; } else