aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-04-26 13:30:25 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-04-26 13:30:25 +0200
commit17478a68106012dfb1b81ec32ce554fb1637cbcf (patch)
treeeb64954e5c8ee4b77b617aa2b3dd845cc7d26d0f
parent5125cad0209640b61007b921637c78504a4924d2 (diff)
Fix changelog generation corner case bug
-rw-r--r--odb/relational/changelog.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/odb/relational/changelog.cxx b/odb/relational/changelog.cxx
index bae2a2c..2bbd04e 100644
--- a/odb/relational/changelog.cxx
+++ b/odb/relational/changelog.cxx
@@ -722,6 +722,8 @@ namespace relational
throw operation_failed ();
}
+
+
// Build the new changelog.
//
model& oldm (old->model ());
@@ -732,7 +734,7 @@ namespace relational
//
//
model* last (&g.new_node<model> (oldm, g));
- model* base (bver == mv.base ? last : 0);
+ model* base (bver == mv.base && mv.base != mv.current ? last : 0);
if (base != 0)
g.new_edge<contains_model> (*cl, *base);