[hibernate-commits] [hibernate/hibernate-orm] 291df6: HHH-7918 - Fix and test

[GitHub]

  Branch: refs/heads/4.1
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 291df63cbb86a4e115a93f591db0772fa5baa48c
      https://github.com/hibernate/hibernate-orm/commit/291df63cbb86a4e115a93f591db0772fa5baa48c
  Author: Lukasz Antoniak <lukasz.antoniak at gmail.com>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ClassAuditingData.java
    M hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java
    M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java
    M hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java
    A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManualFlush.java

  Log Message:
  -----------
  HHH-7918 - Fix and test


  Commit: e51da2c3cb76fca9e7578dd29eb857df2a70ffbc
      https://github.com/hibernate/hibernate-orm/commit/e51da2c3cb76fca9e7578dd29eb857df2a70ffbc
  Author: Lukasz Antoniak <lukasz.antoniak at gmail.com>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ClassAuditingData.java
    M hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java
    M hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java

  Log Message:
  -----------
  HHH-7918 - Completely recalculate entity state on merge


Compare: https://github.com/hibernate/hibernate-orm/compare/38b525630d0a...e51da2c3cb76