Mercurial > hg > truffle

changeset 12521:ef0de9485627

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Mick Jordan <mick.jordan@oracle.com>
date Tue, 22 Oct 2013 08:35:26 -0700
parents 8ee3a8dd762e (diff) b2882f4ab612 (current diff)
children 5ccee20550ea
files mxtool/mx.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)