Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -146,10 +146,14 @@
 ;; from metadat lookup MEGATEST_VERSION
 ;;
 (define (common:get-last-run-version) ;; RADT => How does this work in send-receive function??; assume it is the value saved in some DB
   (rmt:get-var "MEGATEST_VERSION"))
 
+(define (common:get-last-run-version-number)
+  (string->number 
+   (substring (common:get-last-run-version) 0 6)))
+
 (define (common:set-last-run-version)
   (rmt:set-var "MEGATEST_VERSION" (common:version-signature)))
 
 (define (common:version-changed?)
   (not (equal? (common:get-last-run-version)
@@ -174,11 +178,11 @@
 ;;
 (define (common:exit-on-version-changed)
   (if (common:version-changed?)
       (let ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config")))
         (debug:print 0 *default-log-port*
-		     "ERROR: Version mismatch!\n"
+		     "WARNING: Version mismatch!\n"
 		     "   expected: " (common:version-signature) "\n"
 		     "   got:      " (common:get-last-run-version))
 	(if (and (file-exists? mtconf)
 		 (eq? (current-user-id)(file-owner mtconf))) ;; safe to run -cleanup-db
 	    (begin

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -3268,11 +3268,14 @@
       (load debugcontrolf)))
 
 (define (main)
   (if (not (args:get-arg "-skip-version-check"))
       (let ((th1 (make-thread common:exit-on-version-changed)))
-	(thread-start! th1)))
+	(thread-start! th1)
+	(if (> megatest-version (common:get-last-run-version-number))
+	    (debug:print-info 0 *default-log-port* "Version bump detected, blocking until db sync complete")
+	    (thread-join! th1))))
   (let* ((commondat       (dboard:commondat-make)))
     ;; Move this stuff to db.scm? I'm not sure that is the right thing to do...
     (cond 
      ((args:get-arg "-test") ;; run-id,test-id
       (let* ((dat     (let ((d (map string->number (string-split (args:get-arg "-test") ",")))) ;; RADT couldn't find string->number, though it works

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1,7 +1,7 @@
 ;;======================================================================
-;; Copyright 2006-2013, Matthew Welland.
+;; Copyright 2006-2016, Matthew Welland.
 ;; 
 ;;  This program is made available under the GNU GPL version 2.0 or
 ;;  greater. See the accompanying file COPYING for details.
 ;; 
 ;;  This program is distributed WITHOUT ANY WARRANTY; without even the

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1879,10 +1879,11 @@
 ;;======================================================================
 ;; Start a repl
 ;;======================================================================
 
 ;; fakeout readline
+(include "readline-fix.scm")
 
 (if (or (getenv "MT_RUNSCRIPT")
 	(args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (launch:setup))
@@ -1908,11 +1909,10 @@
 	      (import extras) ;; might not be needed
 	      ;; (import csi)
 	      (import readline)
 	      (import apropos)
 	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
-	      (include "readline-fix.scm")
 
 	      (if *use-new-readline*
 		  (begin
 		    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])
 		    (current-input-port (make-readline-port "megatest> ")))