Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: e23fefd5708b31b28d99a4e3599540338019f08b https://github.com/hibernate/hibernate-orm/commit/e23fefd5708b31b28d99a4e... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-07-11 (Fri, 11 Jul 2014) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedMergeEventListener.java A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyNotAllowedObserver.java A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserver.java R hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java A hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java R hibernate-core/src/test/java/org/hibernate/event/internal/EventCacheTest.java A hibernate-core/src/test/java/org/hibernate/event/internal/MergeContextTest.java A hibernate-core/src/test/java/org/hibernate/test/ops/Category.java A hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.hbm.xml A hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.java A hibernate-core/src/test/java/org/hibernate/test/ops/HoarderOrphanDelete.hbm.xml A hibernate-core/src/test/java/org/hibernate/test/ops/Item.java A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsNotAllowedTest.java A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsOrphanDeleteTest.java A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java M hibernate-core/src/test/java/org/hibernate/test/ops/MergeTest.java A hibernate-core/src/test/java/org/hibernate/test/ops/SubCategory.java A hibernate-core/src/test/java/org/hibernate/test/ops/SubItem.java M hibernate-core/src/test/resources/log4j.properties A hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3EntityCopyAllowedMergeEventListener.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Category.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Hoarder.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Item.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeMultipleEntityRepresentationsNotAllowedTest.java M hibernate-entitymanager/src/test/resources/log4j.properties Log Message: ----------- HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) Commit: eef0ca4eabe884366415016e4bec08d445ede79b https://github.com/hibernate/hibernate-orm/commit/eef0ca4eabe884366415016... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-07-11 (Fri, 11 Jul 2014) Changed paths: M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java M hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java R hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedMergeEventListener.java M hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java M hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyNotAllowedObserver.java R hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserver.java M hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java A hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java M hibernate-core/src/test/java/org/hibernate/event/internal/MergeContextTest.java M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsNotAllowedTest.java M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsOrphanDeleteTest.java M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java Log Message: ----------- HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) (cherry picked from commit 6203b5da308ad45167ad0cbcc44214433b4e7f7b) Conflicts: hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java Commit: 7109790ee304da19a5373ab8d8662e68f5b0952f https://github.com/hibernate/hibernate-orm/commit/7109790ee304da19a5373ab... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-07-11 (Fri, 11 Jul 2014) Changed paths: A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesAllowedLoggedTest.java A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesAllowedTest.java A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesCustomTest.java A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesDisallowedTest.java R hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsNotAllowedTest.java R hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsOrphanDeleteTest.java R hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesAllowedTest.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesCustomTest.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesDisallowedTest.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java Log Message: ----------- HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) (cherry picked from commit 368cdc1966b2018e03a3a5a0a6cf420a9939c398) Conflicts: hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java Commit: 5597111f32541b4d0741b65f041ba823ebf2093e https://github.com/hibernate/hibernate-orm/commit/5597111f32541b4d0741b65... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-07-11 (Fri, 11 Jul 2014) Changed paths: M hibernate-core/src/test/resources/log4j.properties M hibernate-entitymanager/src/test/resources/log4j.properties Log Message: ----------- HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) (cherry picked from commit 31bcb0ea0a73c32bbb430ac6eed54005f01a40f2) Commit: 0e43f71ca0ff68bba655a89057508c0619308568 https://github.com/hibernate/hibernate-orm/commit/0e43f71ca0ff68bba655a89... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java R hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3EntityCopyAllowedMergeEventListener.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeMultipleEntityCopiesAllowedTest.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeMultipleEntityCopiesCustomTest.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeMultipleEntityCopiesDisallowedTest.java R hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java R hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeMultipleEntityRepresentationsNotAllowedTest.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesAllowedTest.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesCustomTest.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesDisallowedTest.java Log Message: ----------- HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) Compare: https://github.com/hibernate/hibernate-orm/compare/c871002da797...0e43f71...