Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: e40ade009f6ed926e7cac541a6b55a7d48e896e8 https://github.com/hibernate/hibernate-orm/commit/e40ade009f6ed926e7cac54... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-06-25 (Wed, 25 Jun 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 R hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java R hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedMergeEventListener.java R hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java R hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyNotAllowedObserver.java R hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserver.java A hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java R hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java A hibernate-core/src/test/java/org/hibernate/event/internal/EventCacheTest.java R hibernate-core/src/test/java/org/hibernate/event/internal/MergeContextTest.java R hibernate-core/src/test/java/org/hibernate/test/ops/Category.java R hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.hbm.xml R hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.java R hibernate-core/src/test/java/org/hibernate/test/ops/HoarderOrphanDelete.hbm.xml R hibernate-core/src/test/java/org/hibernate/test/ops/Item.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 M hibernate-core/src/test/java/org/hibernate/test/ops/MergeTest.java R hibernate-core/src/test/java/org/hibernate/test/ops/SubCategory.java R hibernate-core/src/test/java/org/hibernate/test/ops/SubItem.java M hibernate-core/src/test/resources/log4j.properties R hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3EntityCopyAllowedMergeEventListener.java R hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Category.java R hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Hoarder.java R hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Item.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 M hibernate-entitymanager/src/test/resources/log4j.properties Log Message: ----------- HHH-9106: revert HHH-9106 on 4.2 branch