Re-adding tests and restoring behavior where if a property is not found in the ancest...
authorDan Klco <klco@adobe.com>
Thu, 10 Mar 2022 14:58:10 +0000 (09:58 -0500)
committerDan Klco <klco@adobe.com>
Thu, 10 Mar 2022 14:58:10 +0000 (09:58 -0500)
commit8a44639667c6c954253e23af8a3c8f94fd4b52e4
treec5be0931638aa045cf0a1c7e5c939c48389306e5
parent05509c9dd2d390bd818354dccc882e2917c6931f
Re-adding tests and restoring behavior where if a property is not found in the ancestor the custom and product must equal or it will be a conflict
oak-run/src/main/java/org/apache/jackrabbit/oak/index/merge/IndexDefMergerUtils.java
oak-run/src/test/java/org/apache/jackrabbit/oak/index/merge/IndexDefMergerScenariosTest.java
oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/basic.json
oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merge.txt