loading
Documents

Research.Publish.Connect.

Paper

Paper Unlock

Authors: Felix Schwägerl ; Sabrina Uhrig and Bernhard Westfechtel

Affiliation: University of Bayreuth, Germany

ISBN: 978-989-758-007-9

Keyword(s): EMF Models, Model Merging, Graph Algorithms.

Related Ontology Subjects/Areas/Topics: Applications and Software Development ; Model Transformation ; Model-Driven Project Management ; Model-Driven Software Development ; Models ; Paradigm Trends ; Software Engineering

Abstract: Version control for models is not yet supported in an adequate way. In this paper, we address three-way merging of model versions. Based on a common base version b, two alternative versions a1 and a2 were developed by copying and modifying the base version. To reconcile these changes, a merged version m is to be created as a common successor of a1 and a2. We present a graph algorithm to solve an important subproblem which occurs in three-way model merging: merging of (linearly) ordered collections. To create the merged version, a generalized topological sort is performed. Conflicts occur if the order of elements cannot be deduced automatically; these conflicts are resolved either interactively or by default rules. We have implemented the merge algorithm in our tool BTMerge, which performs a consistency-preserving merge of versions of EMF models being instances of arbitrary Ecore models. By taking arbitrary move operations into account, the algorithm considerably goes beyond the functi onality of contemporary merge tools which are based on common subsequences and thus cannot adequately handle move operations. (More)

PDF ImageFull Text

Download
Sign In Guest: Register as new SciTePress user now for free.

Sign In SciTePress user: please login.

PDF ImageMy Papers

You are not signed in, therefore limits apply to your IP address 54.84.236.168

In the current month:
Recent papers: 100 available of 100 total
2+ years older papers: 200 available of 200 total

Paper citation in several formats:
Schwägerl F., Uhrig S. and Westfechtel B. (2014). A Graph-based Algorithm for Three-way Merging of Ordered Collections in EMF Models.In Proceedings of the 2nd International Conference on Model-Driven Engineering and Software Development - Volume 1: MODELSWARD, ISBN 978-989-758-007-9, pages 41-54. DOI: 10.5220/0004702100410054

@conference{modelsward14,
author={Felix Schwägerl and Sabrina Uhrig and Bernhard Westfechtel},
title={A Graph-based Algorithm for Three-way Merging of Ordered Collections in EMF Models},
booktitle={Proceedings of the 2nd International Conference on Model-Driven Engineering and Software Development - Volume 1: MODELSWARD,},
year={2014},
pages={41-54},
publisher={SciTePress},
organization={INSTICC},
doi={10.5220/0004702100410054},
isbn={978-989-758-007-9},
}

TY - CONF

JO - Proceedings of the 2nd International Conference on Model-Driven Engineering and Software Development - Volume 1: MODELSWARD,
TI - A Graph-based Algorithm for Three-way Merging of Ordered Collections in EMF Models
SN - 978-989-758-007-9
AU - Schwägerl F.
AU - Uhrig S.
AU - Westfechtel B.
PY - 2014
SP - 41
EP - 54
DO - 10.5220/0004702100410054

Login or register to post comments.

Comments on this Paper: Be the first to review this paper.