Towards Development with Multi-version Models: Detecting Merge Conflicts and Checking Well-Formedness
Pages 118 - 136
Abstract
Developing complex software requires that multiple views and versions of the software can be developed in parallel and merged as supported by views and managed by version control systems. In this context, this paper considers permanent monitoring of merging and related consistency problems at the level of models and abstract syntax. The presented approach introduces multi-version models based on typed graphs that permit to store changes and multiple versions in one graph in a compact form and allow (1) to study well-formedness for all versions without the need to extract each version individually, (2) to report all possible merge conflicts without the need to merge all pairs of versions, and (3) to report all violations of well-formedness conditions that will result for merges of any two versions independent of any merge decisions without the need to merge all pairs of versions. Thereby, the approach aims to permit early and frequent conflict detection while developing in parallel. The paper defines the related concepts and algorithms operating on multi-version models, proves their correctness w.r.t. the usually employed three-way-merge, and reports on preliminary experiments concerning the scalability.
References
[1]
Arendt T, Biermann E, Jurack S, Krause C, and Taentzer G Petriu DC, Rouquette N, and Haugen Ø Henshin: advanced concepts and tools for in-place EMF model transformations Model Driven Engineering Languages and Systems 2010 Heidelberg Springer 121-135
[2]
Barkowsky, M., Giese, H.: Towards Development with Multi-Version Models: Detecting Merge Conflicts and Checking Well-Formedness. arXiv preprint (2022).
[3]
Blanc X, Mougenot A, Mounier I, and Mens T van Eck P, Gordijn J, and Wieringa R Incremental detection of model inconsistencies based on model operations Advanced Information Systems Engineering 2009 Heidelberg Springer 32-46
[4]
Brun Y, Holmes R, Ernst MD, and Notkin D Early detection of collaboration conflicts and risks IEEE Trans. Softw. Eng. 2013 39 10 1358-1375
[5]
Bruneliere, H., Cabot, J., Jouault, F., Madiot, F.: MoDisco: a generic and extensible framework for model driven reverse engineering. In: Proceedings of the IEEE/ACM International Conference on Automated Software Engineering (2010).
[6]
Czarnecki K and Antkiewicz M Glück R and Lowry M Mapping features to models: a template approach based on superimposed variants Generative Programming and Component Engineering 2005 Heidelberg Springer 422-437
[7]
Czarnecki, K., Pietroszek, K.: Verifying feature-based model templates against well-formedness OCL constraints. In: Proceedings of the 5th International Conference on Generative Programming and Component Engineering, GPCE 2006, pp. 211–220. Association for Computing Machinery, New York (2006).
[8]
Diskin, Z., Czarnecki, K., Antkiewicz, M.: Model-versioning-in-the-large: algebraic foundations and the tile notation. In: 2009 ICSE Workshop on Comparison and Versioning of Software Models, pp. 7–12. IEEE (2009).
[9]
Ehrig H, Ehrig K, Prange U, and Taentzer G Fundamentals of Algebraic Graph Transformation 2006 Heidelberg Springer
[10]
EMF. https://www.eclipse.org/modeling/emf/. Accessed 23 Feb 2022
[11]
Finkelstein ACW, Gabbay D, Hunter A, Kramer J, and Nuseibeh B Inconsistency handling in multiperspective specifications IEEE Trans. Software Eng. 1994 20 8 569-578
[12]
Frühauf K and Zeller A Software configuration management: state of the art, state of the practice System Configuration Management 1999 Heidelberg Springer 217-227
[13]
García-Domínguez, A., Bencomo, N., Parra-Ullauri, J.M., García-Paucar, L.H.: Querying and annotating model histories with time-aware patterns. In: 2019 ACM/IEEE 22nd International Conference on Model Driven Engineering Languages and Systems (MODELS), pp. 194–204. IEEE (2019).
[14]
Giese, H., Hildebrandt, S., Seibel, A.: Improved flexibility and scalability by interpreting story diagrams. In: Electronic Communications of the EASST, vol. 18 (2009).
[15]
Giese H, Maximova M, Sakizloglou L, and Schneider S Hähnle R and van der Aalst W Metric temporal graph logic over typed attributed graphs Fundamental Approaches to Software Engineering 2019 Cham Springer 282-298
[16]
Git. https://git-scm.com/. Accessed 23 Feb 2022
[17]
Heckel R, Küster JM, and Taentzer G Corradini A, Ehrig H, Kreowski H-J, and Rozenberg G Confluence of typed attributed graph transformation systems Graph Transformation 2002 Heidelberg Springer 161-176
[18]
Koegel, M., Helming, J.: EMFStore: a model repository for EMF models. In: Proceedings of the 32nd ACM/IEEE International Conference on Software Engineering-Volume 2, pp. 307–308 (2010).
[19]
Küster JM, Gerth C, and Engels G Paige RF, Hartman A, and Rensink A Dependent and conflicting change operations of process models Model Driven Architecture - Foundations and Applications 2009 Heidelberg Springer 158-173
[20]
Mens T A state-of-the-art survey on software merging IEEE Trans. Softw. Eng. 2002 28 5 449-462
[21]
Murta, L., Corrêa, C., Prudêncio, J.G., Werner, C.: Towards odyssey-VCS 2: improvements over a UML-based version control system. In: Proceedings of the 2008 International Workshop on Comparison and Versioning of Software Models (2008).
[22]
Pietsch, C., Kelter, U., Kehrer, T.: From pairwise to family-based generic analysis of delta-oriented model-based SPLs, pp. 13–24. Association for Computing Machinery, New York (2021).
[23]
Reuling, D., Pietsch, C., Kelter, U., Kehrer, T.: Towards projectional editing for model-based SPLs. In: Proceedings of the 14th International Working Conference on Variability Modelling of Software-Intensive Systems, VAMOS 2020. Association for Computing Machinery, New York (2020).
[24]
Rutle A, Rossini A, Lamo Y, and Wolter U Chechik M and Wirsing M A category-theoretical approach to the formalisation of version control in MDE Fundamental Approaches to Software Engineering 2009 Heidelberg Springer 64-78
[25]
Sakizloglou, L., Ghahremani, S., Barkowsky, M., Giese, H.: Incremental execution of temporal graph queries over runtime models with history and its applications. Softw. Syst. Model. 1–41 (2021).
[26]
Taentzer G, Ermel C, Langer P, and Wimmer M A fundamental approach to model versioning based on graph modifications: from theory to implementation Softw. Syst. Model. 2012 13 1 239-272
[27]
Westfechtel, B.: A formal approach to three-way merging of EMF models. In: Proceedings of the 1st International Workshop on Model Comparison in Practice (2010).
[28]
Westfechtel B and Greiner S Extending single- to multi-variant model transformations by trace-based propagation of variability annotations Softw. Syst. Model. 2020 19 4 853-888
Index Terms
- Towards Development with Multi-version Models: Detecting Merge Conflicts and Checking Well-Formedness
Index terms have been assigned to the content through auto-classification.
Recommendations
Towards accurate recommendations of merge conflicts resolution strategies
Abstract Context:in software engineering, developers working concurrently on a project frequently need to merge changes in the source code. The manual resolution of merge conflicts is a laborious and time-consuming task. Some studies have investigated ...
On the methodology of three-way structured merge in version control systems: Top-down, bottom-up, or both
AbstractThree-way merging is an essential component of version control systems. Despite the efficiency of the conventional line-based textual methods, syntax-based structured approaches have demonstrated benefits in improving merge accuracy. Prior ...
Lazy-Merge: A Novel Implementation for Indexed Parallel $K$-Way In-Place Merging
Merging sorted segments is a core topic of fundamental computer science that has many different applications, such as $n$ -body simulation. In this research, we propose Lazy-Merge, a novel implementation of sequential in-place $k$ -way merging algorithms, that ...
Comments
Information & Contributors
Information
Published In
Jul 2022
215 pages
© The Author(s), under exclusive license to Springer Nature Switzerland AG 2022.
Publisher
Springer-Verlag
Berlin, Heidelberg
Publication History
Published: 07 July 2022
Qualifiers
- Article
Contributors
Other Metrics
Bibliometrics & Citations
Bibliometrics
Article Metrics
- 0Total Citations
- 0Total Downloads
- Downloads (Last 12 months)0
- Downloads (Last 6 weeks)0
Reflects downloads up to 16 Oct 2024
Other Metrics
Citations
View Options
View options
Get Access
Login options
Check if you have access through your login credentials or your institution to get full access on this article.
Sign in