Index: engine/src/test/resources/merge/new-node/in/exportFirst/hcm-config/exportFirst.yaml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- engine/src/test/resources/merge/new-node/in/exportFirst/hcm-config/exportFirst.yaml (revision 0650c8be062201cc6fd9b939267f9b29670ee4e5) +++ engine/src/test/resources/merge/new-node/in/exportFirst/hcm-config/exportFirst.yaml (revision ) @@ -8,3 +8,7 @@ jcr:primaryType: nt:unstructured /exportFirstExistingRoot: jcr:primaryType: nt:unstructured + /deletedInFirst: + .meta:delete: true + /deletedInFirstSuperfluousDefinitionInSecond: + .meta:delete: true Index: engine/src/test/resources/merge/new-node/out/exportFirst/hcm-config/exportFirst.yaml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- engine/src/test/resources/merge/new-node/out/exportFirst/hcm-config/exportFirst.yaml (revision 0650c8be062201cc6fd9b939267f9b29670ee4e5) +++ engine/src/test/resources/merge/new-node/out/exportFirst/hcm-config/exportFirst.yaml (revision ) @@ -18,3 +18,9 @@ jcr:primaryType: nt:unstructured /shouldAddToDef: jcr:primaryType: nt:unstructured + /deletedInFirst: + jcr:primaryType: nt:unstructured + property: value + /deletedInFirstSuperfluousDefinitionInSecond: + jcr:primaryType: nt:unstructured + property: value Index: engine/src/test/resources/merge/new-node/in/topmost/hcm-config/topmost.yaml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- engine/src/test/resources/merge/new-node/in/topmost/hcm-config/topmost.yaml (revision 0650c8be062201cc6fd9b939267f9b29670ee4e5) +++ engine/src/test/resources/merge/new-node/in/topmost/hcm-config/topmost.yaml (revision ) @@ -2,3 +2,7 @@ config: /topmost: jcr:primaryType: nt:unstructured + /deletedInFirst: + jcr:primaryType: nt:unstructured + /deletedInFirstSuperfluousDefinitionInSecond: + jcr:primaryType: nt:unstructured Index: engine/src/test/resources/merge/new-node/in/diff/hcm-config/diff.yaml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- engine/src/test/resources/merge/new-node/in/diff/hcm-config/diff.yaml (revision 0650c8be062201cc6fd9b939267f9b29670ee4e5) +++ engine/src/test/resources/merge/new-node/in/diff/hcm-config/diff.yaml (revision ) @@ -26,4 +26,10 @@ .meta:ignore-reordered-children: true jcr:primaryType: nt:unstructured /newAsChild2: - jcr:primaryType: nt:unstructured \ No newline at end of file + jcr:primaryType: nt:unstructured + /deletedInFirst: + jcr:primaryType: nt:unstructured + property: value + /deletedInFirstSuperfluousDefinitionInSecond: + jcr:primaryType: nt:unstructured + property: value Index: engine/src/test/resources/merge/new-node/in/exportSecond/hcm-config/exportSecond.yaml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- engine/src/test/resources/merge/new-node/in/exportSecond/hcm-config/exportSecond.yaml (revision 0650c8be062201cc6fd9b939267f9b29670ee4e5) +++ engine/src/test/resources/merge/new-node/in/exportSecond/hcm-config/exportSecond.yaml (revision ) @@ -2,3 +2,5 @@ config: /topmost/upstream/exportSecond: jcr:primaryType: nt:unstructured + /deletedInFirstSuperfluousDefinitionInSecond: + ignored: value Index: engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java (revision 0650c8be062201cc6fd9b939267f9b29670ee4e5) +++ engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java (revision ) @@ -96,7 +96,8 @@ this.testName = testName; Map> modules = new HashMap<>(); - modules.put("exportFirst", Arrays.asList("/topmost", "/exportFirstExistingRoot", "/hippo:namespaces")); + modules.put("exportFirst", Arrays.asList("/topmost", "/exportFirstExistingRoot", "/deletedInFirst", + "/deletedInFirstSuperfluousDefinitionInSecond", "/hippo:namespaces")); modules.put("exportSecond", singletonList("/")); autoExportConfig = new AutoExportConfig(true, modules, null, null); }