论文标题

通过多次模型进行开发:检测合并冲突并检查良好的形式

Towards Development with Multi-Version Models: Detecting Merge Conflicts and Checking Well-Formedness

论文作者

Barkowsky, Matthias, Giese, Holger

论文摘要

开发复杂的软件要求该软件的多个视图和版本可以并行开发,并在视图支持下由版本控制系统管理。 在这种情况下,本文考虑了在模型和抽象语法级别永久监视合并和相关的一致性问题,以便在并行发展时允许早期和频繁的冲突检测。所提出的方法介绍了基于类型图的多次模型,可以以紧凑的形式将更改和多个版本存储在一个图中,并允许(1)研究所有版本的良好形式,而无需单独提取每个版本,(2)以(2)报告所有可能的合并冲突而无需违反所有范围的均可及时均可及时(3)违反任何范围,并且(3)有任何范围的条件。决策无需合并所有版本。 本文定义了在多转化模型上运行的相关概念和算法,证明了它们的正确性W.R.T.

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 monitoring merging and related consistency problems permanently at the level of models and abstract syntax to permit early and frequent conflict detection while developing in parallel. 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. 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.

扫码加入交流群

加入微信交流群

微信交流群二维码

扫码加入学术交流群,获取更多资源