[isidorus-cvs] r460 - trunk/src/model

[Lukas Giessmann]

Author: lgiessmann
Date: Mon May  9 07:38:55 2011
New Revision: 460

Log:
datamodel: fixed a bug when merging two associations, whereas each association owns a role that is equivalent to the other and both roles are reified by the same reifier-topic.

Modified:
   trunk/src/model/datamodel.lisp

Modified: trunk/src/model/datamodel.lisp
==============================================================================
--- trunk/src/model/datamodel.lisp	(original)
+++ trunk/src/model/datamodel.lisp	Mon May  9 07:38:55 2011
@@ -2782,8 +2782,10 @@
 	     (roles construct-1 :revision revision)
 	     (roles construct-2 :revision revision)
 	     :test #'(lambda(role-1 role-2)
-		       (strictly-equivalent-constructs role-1 role-2
-						       :revision revision))))))
+		       ;(strictly-equivalent-constructs role-1 role-2
+		       ;:revision revision))))))
+		       (equivalent-constructs role-1 role-2
+					      :revision revision))))))
 
 
 (defgeneric AssociationC-p (class-symbol)