From 17478a68106012dfb1b81ec32ce554fb1637cbcf Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 26 Apr 2013 13:30:25 +0200
Subject: Fix changelog generation corner case bug

---
 odb/relational/changelog.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'odb')

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);
 
-- 
cgit v1.1