Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 2a9f3ad9edacc76d02bae1a476550252d3cf83d1 https://github.com/hibernate/hibernate-orm/commit/2a9f3ad9edacc76d02bae1a... Author: Lukasz Antoniak <lukasz.antoniak(a)gmail.com&gt; 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: 8e38db58331f7be2ee4b580b9a1a4a43da20245a https://github.com/hibernate/hibernate-orm/commit/8e38db58331f7be2ee4b580... Author: Lukasz Antoniak <lukasz.antoniak(a)gmail.com&gt; 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/6062eb67ea7f...8e38db5...