Diff and merge support for model based development

Proceedings - International Conference on Software Engineering

Volumn , Issue , 2008, Pages 31-34

  Bendix, Lars ^a   Emanuelsson, Pär ^b  

^a LUND INSTITUTE OF TECHNOLOGY   (Sweden)

^b ERICSSON RESEARCH   (Sweden)

Author keywords

Diff; Merge; Models; Parallel work; Versioning

Indexed keywords

DIFF; FEATURE-ORIENTED; MERGE; MODEL BASED DEVELOPMENT; PARALLEL WORK; VERSIONING;

SOFTWARE ENGINEERING;

MODELS;

EID: 79959417399     PISSN: 02705257     EISSN: None     Source Type: Conference Proceeding    
DOI: 10.1145/1370152.1370161     Document Type: Conference Paper

References (20)

1. Alanen, M. and Porres, I.: Difference and Union of Models, in Proceedings of The Sixth International Conference on the Unified Modeling Language - UML 2003, San Francisco, California, October 20-24, 2003.
2. Altmanninger, K. : Models in Conflict - Towards a Semantically Enhanced Version Control System for Models, in Proceedings of the Doctoral Symposium at the 10th International Conference on Model Driven Engineering Languages and Systems, Nashville, Tennessee, September 30-October 5, 2007.
3. Asklund, U.: Identifying Conflicts During Structural Merge, in Proceedings of Nordic Workshop on Programming Environment Research, Lund, Sweden, June 1-3, 1994.
4. Asklund, U., Bendix, L., Christensen, H. B., and Magnusson, B.: The Unified Extensional Versioning Model, in Proceedings of the 9th International Symposium on System Configuration Management, Toulouse, France, September 5-7, 1999.
5. Babich, W. A.: Software Configuration Management Coordination for Team Productivity, Addison-Wesley, 1986.
6. Berzins, V.: Software Merge: Semantics of Combining Changes to Programs, ACM Transactions on Programming Languages and Systems, Vol. 16, No. 6, November, 1994.
7. Buffenbarger, J.: Syntactic Software Merging, in Proceedings of the 5th International Workshop on Software Configuration Management, Seattle, Washington, April 24-25, 1995.
8. Brunet, G., Chechik, M., Easterbrook, S., Nejati, S., Niu, N., and Sabetzadeh, M.: A Manifesto for Model Merging, in Proceedings of the international workshop on Global integrated model management, Shanghai, China, May 22, 2006.
9. Fowler, M.: Continuous Integration, Retrieved June 1 st, 2006, from http://www.martinfowler.com/articles/continuousIntegration.html.
10. Kofman, M., Perjons, E.: MetaDiff- a Model Comparison Framework, http://metadiff.sourceforge.net/docs/metadiff.pdf, undated.
11. Kristensen, B. B., Madsen, O. L., Møller-Pedersen, B., and Nygaard, K.: Syntax Directed Program Modularization. In: Interactive Computing Systems (ed. P. Degano, E. Sandewall), North-Holland, 1983.
12. Madsen, O. L., Meller-Pedersen, B., and Nygaard, K.: Object-Oriented Programming in the BETA Programming Language, Chapter 17: Modularization, Wiley, 1993.
13. Magnusson, B., Asklund, U., and Minör, S.: Fine-Grained Revision Control for Collaborative Software Development, in Proceedings of the 1st ACM SIGSOFT symposium on Foundations of Software Engineering, Los Angeles, California, December 8-10, 1993.
14. Ohst, D., Kelter, U.: A Fine-grained Version and Configuration Model in Analysis and Design, in Proceedings of the International Conference on Software Maintenance, Montreal, Canada, October 3-6, 2002.
15. Oliveira, H., Murta, L., and Werner, C.: Odyssey-VCS: a Flexible Version Control System for UML Model Elements, in Proceedings of the 12th International workshop on Software Configuration Management, Lisbon, Portugal, September 5-6, 2005.
16. Sabetzadeh, M., Nejati, S.: TReMer: A Tool for Relationship-Driven Model Merging, poster at Formal Methods 2006, Hamilton, Ontario, August 23-25, 2006.
17. Selonen, P: A Review of UML Model Comparison Approaches, in Proceedings of Nordic Workshop on Model Driven Engineering, Ronneby, Sweden, August 27-29, 2007.
18. Thione, G. L., Perry, D. E.: Parallel Changes: Detecting Semantic Interferences, in Proceedings of COMPSAC 2005, Edinburgh, UK, July 26-28, 2005.
19. Toulmé, A.: Presentation of EMF Compare Utility, position paper at Eclipse Summit, Esslingen, Germany, October 11-12, 2006.
20. Treude, C., Berlik, S., Wenzel, S., Kelter, U.: Difference Computation of Large Models, in Proceedings of ESEC/FSE 2007, Dubrovnik, Croatia, September 3-7, 2007.