# HG changeset patch
# User Mick Jordan <mick.jordan@oracle.com>
# Date 1382456126 25200
# Node ID ef0de9485627daaeaff55d019d0b56cd73b1b68f
# Parent  8ee3a8dd762ef2cfab8ed2b41327c59c1d5ae995# Parent  b2882f4ab612d1804d05c380a6c4a37e024d752a
Merge

diff -r b2882f4ab612 -r ef0de9485627 mxtool/mx.py
--- a/mxtool/mx.py	Tue Oct 22 15:10:14 2013 +0200
+++ b/mxtool/mx.py	Tue Oct 22 08:35:26 2013 -0700
@@ -4029,7 +4029,10 @@
     importee_source = _src_suitemodel._importee_dir(source, suite_import.name)
     importee_dest = _dst_suitemodel._importee_dir(s.dir, suite_import.name)
     if exists(importee_dest):
+        # already exists in the suite model, but may be wrong version
         importee_suite = _scloneimports_suitehelper(importee_dest)
+        if suite_import.version is not None and importee_suite.version != suite_import.version:
+            abort("import version of " + suite_import.name + " in " + s.name + " does not match the version in already existing suite: " + importee_suite.dir)
         importee_suite._visit_imports(_scloneimports_visitor, source=importee_source)
     else:
         _sclone(importee_source, importee_dest, suite_import.version, False)