[hibernate-commits] [hibernate/hibernate-orm] c3c0cd: HHH-12592 : add assertions to ensure that the deta...

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: c3c0cd550fb9ad13ace8ed9ba5645a9231053f6d https://github.com/hibernate/hibernate-orm/commit/c3c0cd550fb9ad13ace8ed9... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java Log Message: ----------- HHH-12592 : add assertions to ensure that the detached and merged collection are not the same, which currently fails Commit: e1b08967d947f12ee774ebbbc5b9e1a38a360603 https://github.com/hibernate/hibernate-orm/commit/e1b08967d947f12ee774ebb... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M hibernate-core/src/main/java/org/hibernate/type/CollectionType.java Log Message: ----------- Revert "HHH-12592 - Fix merging detached enhanced entities with orphan-removal collections." This reverts commit 4f119105f887855d6baecb0ac8837d984b40b4b7. Commit: 6aa8301499577746ff66ecd735a6330e3e373e38 https://github.com/hibernate/hibernate-orm/commit/6aa8301499577746ff66ecd... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedCollectionInEmbeddableTest.java M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java Log Message: ----------- HHH-12592 : Add more tests Commit: 01caa5f2b4d5dfee04016d6628a529e437894dcb https://github.com/hibernate/hibernate-orm/commit/01caa5f2b4d5dfee04016d6... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/loading/internal/CollectionLoadContext.java Log Message: ----------- HHH-12592 - Fix merging detached enhanced entities with orphan-removal collections. Compare: https://github.com/hibernate/hibernate-orm/compare/80bf92e32a0d...01caa5f... **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.