Zusammenfassung
Zur Koordination der verteilten Bearbeitung von Software-Modellen müssen die entstandenen Modellversionen wieder zusammengeführt werden. Daher wird eine zufriedenstellende Toolunterstützung in Form von Versionierungssystemen (VCSs) als wesentlich erachtet. Es haben sich unterschiedliche Ansätze für das Zusammenführen von Modellen einschließlich Konflikterkennungsmethoden entwickelt. Dabei herrscht nur eine eingeschränkte Einigkeit über eine mögliche Kategorisierung von Konflikten. Eine gemeinsame Terminologie und Kategorisierung fehlen. In diesem Artikel wird eine Kategorisierung von Konflikten in der Modellversionierung zusammen mit einer Bewertung der Niveaus der Schwere von Konflikten vorgeschlagen: eine Basis für zukünftige Diskussionen und für den Vergleich von Konflikterkennungsansätzen für Modelle.
Summary
To coordinate different versions of a software model, edited by modelers in parallel, various model versions need to be merged to one consolidated version. Therefore, adequate tool support in terms of version control systems (VCSs) is considered essential. Diverse approaches evolved for merging model versions including different conflict detection methods. Indeed, only a limited consensus about possible categories for conflicts exists. A common terminology and a categorization of possible types of conflict are missing. In this article we propose a categorization for conflicts in model versioning along with an assessment of levels of severity: a base for future discussions and comparison of approaches to conflict detection on models.
This is a preview of subscription content, log in via an institution to check access.
References
Altmanninger, K., Seidl, M., Wimmer, M. (2009): A Survey on Model Versioning Approaches. Int. Journal on Semantic Web and Information Systems, 5 (3): 271–304
Altmanninger, K., Brosch, P., Kappel, G., Langer, P., Seidl, M., Wieland, K., Wimmer, M. (2009): Why Model Versioning Research is needed? An experience report. Proc. Models and Evolution Workshop, Denver, CO, USA: 79–90
Altmanninger, K. (2007): Models in Conflict – Towards a Semantically enhanced Version Control System for Models. Models in Software Engineering, Workshops and Symposia at MoDELS 2007, Reports and Revised Selected Papers, Nashville, TN, USA, LNCS 5002, Springer: 293–304
Bendix, L., Emanuelsson, P. (2009): Collaborative work with Software Models – Industrial Experience and Requirements. Proc. 2nd Int. Conf. on Model Based Systems Engineering, Haife, Israel: 60–68
Brosch, P. (2009): Improving Conflict Resolution in Model Versioning Systems. Software Engineering Companion Volume of the 31th Int. Conf. on Software Engineering (ICSE), Vancouver, Canada, IEEE: 355–358
Brosch, P., Langer, P., Seidl, M., Wieland, K., Wimmer, M., Kappel, G., Retschitzegger, W., Schwinger, W. (2009): An Example is worth a Thousand Words: composite operation modeling by-example. Proc. 12th Int. MODELS Conf., Denver, Colorado, USA, LNCS 5795, Springer: 271–285
Cicchetti, A., Di Ruscio, D., Pierantonio, A. (2008): Managing Model Conflicts in Distributed Development. Proc. 11th Int. MODELS Conf., Toulouse, France, LNCS 5301, Springer: 311–325
Conradi, R., Westfechtel, B. (1998): Version Models for Software Configuration Management. ACM Computing Surveys, 30 (2): 232–282
Estublier, J., Leblang, D., van der Hoek, A., Conradi, R., Clemm, G., Tichy, W. F., Wiborg-Weber, D. (2005): Impact of Software Engineering Research on the Practice of Software Configuration Management. ACM Transactions on Software Engineering and Methodology, 14 (4): 383–430
Fowler, M., Beck, K., Brant, J., Opdyke, W., Roberts, D. (1999): Refactoring: Improving the design of existing code. Boston: Addison-Wesley
Gerth, C., Küster, J., Engels, G. (2009): Language-independent change management of process models. Proc. 12th Int. MODELS Conf., Denver, Colorado, USA, LNCS 5795, Springer: 152–166
Harel, D., Rumpe, B. (2004): Meaningful modeling: what’s the semantics of “semantics”? Computer, 37 (10): 64–72
Kögel, M., Helming, J., Seyboth, S. (2009): Operation-based conflict detection and resolution. Proc. Int. Workshop on Comparison and Versioning of Software Models, Vancouver, Canada, IEEE: 43–48
Mens, T. (2002): A state-of-the-art survey on software merging. IEEE Transactions on Software Engineering, 28 (5): 449–462
Robbes, R., Lanza, M., Lungu, M. (2007): An approach to software evolution based on semantic change. Fundamental Approaches to Software Engineering, LNCS 4422, Springer: 27–41
Schobbens, P.-Y., Heymans, P., Trigaux, J.-C. (2006): Feature diagrams: a survey and a formal semantics. Proc. 14th Int. Conf. on Requirements Engineering, IEEE Computer Society: 136–145
Shao, D., Khurshid, S., Perry, D. E. (2007): Evaluation of semantic interference detection in parallel changes: an exploratory experiment. Proc. 23rd Int. Conf. on Software Maintenance, Paris, France, IEEE: 74–83
Slonneger, K., Kurtz, B. (1995): Formal syntax and semantics of programming languages: a laboratory based approach. Addison-Wesley Longman Publishing Co., Inc., Boston, MA, USA
Thione, G. L., Perry, D. E. (2005): Parallel changes: detecting semantic interferences. Annual Int. Computer Software and Applications Conf.: 47–56
Author information
Authors and Affiliations
Rights and permissions
About this article
Cite this article
Altmanninger, K., Pierantonio, A. A categorization for conflicts in model versioning. Elektrotech. Inftech. 128, 421–426 (2011). https://doi.org/10.1007/s00502-011-0063-z
Received:
Accepted:
Issue Date:
DOI: https://doi.org/10.1007/s00502-011-0063-z