Christian Bartelt
ABSTRACT
Specification by models plays a decisive role, during the development process of complex systems. The division and concurrency of labor in teams is a further characteristic of such development. Therefore an efficient configuration and variant management of resulting documents is essential. In practice, a lot of established configuration management systems like CVS and Subversion are available which provide a text based merge. Unfortunately these systems are inappropriate for the management of models because they ignore the syntactic and semantic structure which is specified by the associated meta-models. Especially during the merge of model versions the mentioned systems fails at the generation of a meta-model consistent model. In this paper a proposal is presented which is enabled to merge model versions in a model based, collaborative development process. Furthermore meta-model independent methods for consistent-receiving model merging are explained.
- Alanen, M., Porres, I. 2003. Difference and Union of Models. In Proc. UML 2003.Google Scholar
Cross Ref
- Bartelt, C., An Optimistic Three-way Merge Based on a Meta-Model Independent Modularization of Models to Support Concurrent Evolution. Unpublished.Google Scholar
- Conradi, R., Westfechtel, B. 1998. Version models for software configuration management. ACM Computing Surveys 30, 2, 232--282. Google ScholarDigital Library
- Concurrent Versions System. http://www.nongnu.org/cvs/ (2008)Google Scholar
- EMF Homepage. http://www.eclipse.org/modeling/emf/ (2008)Google Scholar
- Kelter, U., Wehren, J., Niere, J. 2005. A Generic Difference Algorithm for UML Models, SE 2005Google Scholar
- Mens, T. 2002. A state-of-the-art survey on software merging. IEEE Transactions on Software Engineering, 28(5), p. 449--462. Google ScholarDigital Library
- Mens, T., Van Der Straeten, R. 2005. On the use of formal techniques to support model evolution. In: Proc. 1ères Journées sur l'Ingénierie Dirigée par les Modèles. 115--124Google Scholar
- Mens, T., Van Der Straeten, R., D'Hondt, M. 2006. Detecting and resolving model inconsistencies using transformation dependency analysis. In Model Driven Engineering Languages and Systems (p.200--214). Springer, Berlin / Heidelberg. Google ScholarDigital Library
- Niu, N., Easterbrook, S., Sabetzadeh, M. 2005. A category-theoretic approach to syntactic software merging. Software Maintenance, 2005. ICSM'05. Proceedings of the 21st IEEE International Conference on (p. 197--206) Google ScholarDigital Library
- Ohst, D., Welle, M., Kelter, U.: Differences Between Versions of UML Diagrams, In: Proc. of ESEC'03, Helsinki, Finland (2003) 227--236 Google ScholarDigital Library
- Reiter, T., Altmanninger, K., Bergmayr, A., Schwinger, W., Kotsis, G. 2007. Models in Conflict - Detection of Semantic Conflicts in Model-based Development. In Proceedings of the 3rd Intl. Workshop on Model-Driven Enterprise Information Systems, MDEIS 2007, INSTICC PRESS, pp. 29--40Google Scholar
- Sabetzadeh, M., Easterbrook, S. 2005. An algebraic framework for merging incomplete and inconsistent views. Requirements Engineering, 2005. Proceedings. 13th IEEE International Conference on (p. 306--315). Google ScholarDigital Library
- Scheider, C., Zündorf, A. 2007 Experiences in using Optimisitic Locking in Fujaba. Softwaretechnik Trends 27, 2 (May 2007)Google Scholar
- Subversion. http://subversion.tigris.org/ (2008)Google Scholar
- Schneider, C., Zündorf, A., Niere, J. 2004. 'CoObRA - a small step for development tools to collaborative environments'. In Proc. of the Workshop on Directions in Software Engineering Environments (WoDiSEE), Edinburgh, Scotland, UKGoogle ScholarCross Ref
- Tichy, F. W. 1985. RCS - A system for version control. Software Practice & Experience. 15. (p. 637--654) Google ScholarDigital Library
Index Terms
- Consistence preserving model merge in collaborative development processes
Recommendations
A Graph-Pattern Based Approach for Meta-Model Specific Conflict Detection in a General-Purpose Model Versioning System
Proceedings of the 16th International Conference on Model-Driven Engineering Languages and Systems - Volume 8107Model driven engineering is the key paradigm in many large system development efforts today. A good versioning system for models is essential for change management and coordinated development of these systems. Support for conflict detection and ...
Inconsistency Resolution in Merging Versions of Architectural Models
WICSA '14: Proceedings of the 2014 IEEE/IFIP Conference on Software ArchitectureState-of-the-art optimistic model versioning systems, which are critical to enable efficient team-based development of architectural models, are able to detect and help resolve basic conflicts arising during the merging of model versions. However, it is ...
Unifying Configuration Management with Merge Conflict Detection and Awareness Systems
ASWEC '13: Proceedings of the 2013 22nd Australian Conference on Software EngineeringAs software development becomes an increasingly collaborative effort, traditional development tools have to be extended to support seamless collaboration while minimizing the chances of conflicts. This paper describes Cloud Studio, a collaboration ...
Comments