Consistence preserving model merge in collaborative development processes

Proceedings - International Conference on Software Engineering

Volumn , Issue , 2008, Pages 13-18

  Bartelt, Christian ^a  

^a CLAUSTHAL UNIVERSITY OF TECHNOLOGY   (Germany)

Author keywords

Collaborative development; Inconsistency management; Model driven engineering; Model merge; Model versioning; Software configuration management

Indexed keywords

COLLABORATIVE DEVELOPMENT; CONFIGURATION MANAGEMENT SYSTEMS; DEVELOPMENT PROCESS; INCONSISTENCY MANAGEMENT; META MODEL; MODEL DRIVEN ENGINEERING; MODEL MERGING; MODEL-BASED OPC; SEMANTIC STRUCTURES; SOFTWARE CONFIGURATION MANAGEMENT;

COBALT COMPOUNDS; MODELS; SEMANTICS; SOFTWARE ENGINEERING;

MERGERS AND ACQUISITIONS;

EID: 79959442390     PISSN: 02705257     EISSN: None     Source Type: Conference Proceeding    
DOI: 10.1145/1370152.1370157     Document Type: Conference Paper

References (17)

1. Alanen, M., Porres, I. 2003. Difference and Union of Models. In Proc. UML 2003.
2. Bartelt, C., An Optimistic Three-way Merge Based on a Meta-Model Independent Modularization of Models to Support Concurrent Evolution. Unpublished.
3. Conradi, R., Westfechtel, B. 1998. Version models for software configuration management. ACM Computing Surveys 30, 2, 232-282. (Pubitemid 128485204)
4. Concurrent Versions System, http://www.nongnu.org/cvs/(2008)
5. EMF Homepage. http://www.eclipse.org/modeling/emf/(2008)
6. Kelter, U., Wehren, J., Niere, J. 2005. A Generic Difference Algorithm for UML Models, SE 2005
7. Mens, T. 2002. A state-of-the-art survey on software merging. IEEE Transactions on Software Engineering, 28(5), p. 449-462. (Pubitemid 34669572)
8. Mens, T., Van Der Straeten, R. 2005. On the use of formal techniques to support model evolution In: Proc. lères Journées sur l'Ingénierie Dirigée par les Modèles. 115-124
9. 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. (Pubitemid 44618560)
10. Niu, N., Easterbrook, S., Sabetzadeh, M. 2005. A categorytheoretic approach to syntactic software merging. Software Maintenance, 2005. ICSM'05. Proceedings of the 21st IEEE International Conference on (p. 197-206)
11. Ohst, D., Welle, M., Kelter, U.: Differences Between Versions of UML Diagrams, In: Proc. of ESEC'03, Helsinki, Finland (2003) 227-236
12. 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-40
13. 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).
14. Scheider, C., Zündorf, A. 2007 Experiences in using Optimisitic Locking in Fujaba. Softwaretechnik Trends 27, 2 (May 2007)
15. Subversion, http://subversion.tigris.org/(2008)
16. 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, UK
17. Tichy, F. W. 1985. RCS - A system for version control. Software Practice & Experience. 15. (p. 637-654)