Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 6fdc9bac1394a601e014129325fc1edb34a8c2ba https://github.com/hibernate/hibernate-orm/commit/6fdc9bac1394a601e014129... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java A hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEntityCopyObserver.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.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 A hibernate-core/src/main/java/org/hibernate/event/internal/NoEntityCopiesMergeEventListener.java R hibernate-core/src/test/java/org/hibernate/event/internal/EventCacheTest.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/jpa/event/internal/core/JpaNoEntityCopiesMergeEventListener.java M hibernate-entitymanager/src/test/resources/log4j.properties Log Message: ----------- HHH-9106 : Merging multiple representations of the same entity merged (cherry picked from commit 70532259faa14064cff8263cbb7ad6d82d607892) Conflicts: hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java hibernate-core/src/test/java/org/hibernate/event/internal/EventCacheTest.java hibernate-core/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java hibernate-core/src/test/java/org/hibernate/test/ops/Category.java hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.hbm.xml hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.java hibernate-core/src/test/java/org/hibernate/test/ops/Item.java hibernate-core/src/test/resources/log4j.properties Commit: 5a7310c39a47784ba477ea40993c5f8bafb759e3 https://github.com/hibernate/hibernate-orm/commit/5a7310c39a47784ba477ea4... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsOrphanDeleteTest.java M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java Log Message: ----------- HHH-9239 HHH-9240 : FailureExpected test cases when merging entity copies with dirty collections (cherry picked from commit c7c5b015c134df993de4105a2bc3e70d7e14ad68) Commit: cedc1e76675da9bfb88ee860ad79834d18d281c6 https://github.com/hibernate/hibernate-orm/commit/cedc1e76675da9bfb88ee86... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: R hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEntityCopyObserver.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 R hibernate-core/src/main/java/org/hibernate/event/internal/NoEntityCopiesMergeEventListener.java A hibernate-core/src/test/java/org/hibernate/event/internal/MergeContextTest.java M hibernate-core/src/test/java/org/hibernate/test/ops/Category.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 M hibernate-core/src/test/resources/log4j.properties A hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/core/JpaEntityCopyAllowedMergeEventListener.java R hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/core/JpaNoEntityCopiesMergeEventListener.java M hibernate-entitymanager/src/test/resources/log4j.properties Log Message: ----------- HHH-9106 : Merging multiple representations of the same entity (cherry picked from commit 2daaf9a1965b70897928ea222ea8708acaad3bbd) Commit: 7791a7048a097ea79de9fefec15b7ce205377282 https://github.com/hibernate/hibernate-orm/commit/7791a7048a097ea79de9fef... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/Category.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/Hoarder.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/Item.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsNotAllowedTest.java Log Message: ----------- HHH-9106 : Merging multiple representations of the same entity (entitymanager test cases) (cherry picked from commit 055b0cacaec4fbb136a1fc592fa00cb7e950eb61) Commit: 7d4ca57c8b3ee12829c8cab52c04b5291b46b56f https://github.com/hibernate/hibernate-orm/commit/7d4ca57c8b3ee12829c8cab... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java M hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java A hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3EntityCopyAllowedMergeEventListener.java R hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/core/JpaEntityCopyAllowedMergeEventListener.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 R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/Category.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/Hoarder.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/Item.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsNotAllowedTest.java Log Message: ----------- HHH-9106 : Merging multiple representations of the same entity Compare: https://github.com/hibernate/hibernate-orm/compare/5da9da458575...7d4ca57...