Import Error on version update

[cboschert1]

Expected Behavior

When importing two files, an interface with a component referencing the v1 schema and the v2 interface versioned with additional properties, the models should be imported. I would expect the folder structure to be this after running the command:

versionedRepo
    testmodel.json
    testcomponentmodel.json
localRepo
    testmodel-1.json
    testmodel-2.json
    testcomponentmodel-1.json

Actual Behavior

The dmr-client will see duplicate properties and fail to import the new interface.
Error:

[Error]: dtmi:TestModel:UnchangedProperty;1 has more than one definition. Remove all but one JSON object containing '@id' property with value dtmi:TestModel:UnchangedProperty;1, or change the '@id' values so there are no duplicates.

Steps to Reproduce

Run the command from the attached repository: tests.zip

dmr-client import --directory ./versionedRepo --search-pattern "*.json" --local-repo ./localRepo

[rido-min]

versionedRepo/testdevice.json and versionedRepo/testcomponentmodel.json have the same @id what is not permitted in the DMR, each interface must be unique.

if you want to version TestModel, it should have a new version.

[cboschert1]

Sorry, I attached the wrong files with a copy and paste error. I've attached an updated example with the correct files.
tests.zip

[rido-min]

I see, seems there is a conflict when the updated model has an @id in a property. I see two workarounds:

1. remove the '@id' from the property
2. import files one by one instead of importing the full folder.