From 10a444fb7c378a71e5c2a8733e304ca01ad97c5c Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 21 Nov 2019 10:46:22 +0100 Subject: [PATCH] [jOOQ/jOOQ#9505] Make sure only versions with a common ancestor are merged --- jOOQ/src/main/java/org/jooq/impl/VersionImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jOOQ/src/main/java/org/jooq/impl/VersionImpl.java b/jOOQ/src/main/java/org/jooq/impl/VersionImpl.java index a6bdce04cc..165d586301 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VersionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/VersionImpl.java @@ -53,6 +53,7 @@ import org.jooq.Queries; import org.jooq.Query; import org.jooq.Source; import org.jooq.Version; +import org.jooq.exception.DataDefinitionException; /** * @author Lukas Eder @@ -266,6 +267,8 @@ final class VersionImpl implements Version { + +