[hibernate-commits] [hibernate/hibernate-orm] 2148f4: HHH-12439 : Merging of new entities can fail depen...

[GitHub]

  Branch: refs/heads/5.1
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 2148f4add67112f869e73db2a36ce37163292150
      https://github.com/hibernate/hibernate-orm/commit/2148f4add67112f869e73db2a36ce37163292150
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2018-03-28 (Wed, 28 Mar 2018)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java
    M hibernate-core/src/main/java/org/hibernate/type/EntityType.java
    A hibernate-core/src/test/java/org/hibernate/test/ops/MergeManagedAndCopiesAllowedTest.java

  Log Message:
  -----------
  HHH-12439 : Merging of new entities can fail depending on cascade order


  Commit: 37e39d9ca4f1970b0514661665cdc9e538a0bc7a
      https://github.com/hibernate/hibernate-orm/commit/37e39d9ca4f1970b0514661665cdc9e538a0bc7a
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2018-03-28 (Wed, 28 Mar 2018)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/ops/MergeManagedAndCopiesAllowedTest.java

  Log Message:
  -----------
  HHH-12439 : Fix test to work on pre-5.2 versions


Compare: https://github.com/hibernate/hibernate-orm/compare/892103430d0a...37e39d9ca4f1