DeltaImpactFinder: Assessing Semantic Merge Conflicts with Dependency Analysis - INRIA - Institut National de Recherche en Informatique et en Automatique Accéder directement au contenu
Communication Dans Un Congrès Année : 2015

DeltaImpactFinder: Assessing Semantic Merge Conflicts with Dependency Analysis

Résumé

In software development, version control systems (VCS) provide branching and merging support tools. Such tools are popular among developers to concurrently change a code-base in separate lines and reconcile their changes automatically afterwards. However, two changes that are correct independently can introduce bugs when merged together. We call semantic merge conflicts this kind of bugs. Change impact analysis (CIA) aims at estimating the effects of a change in a codebase. In this paper, we propose to detect semantic merge conflicts using CIA. On a merge, DELTAIMPACTFINDER analyzes and compares the impact of a change in its origin and destination branches. We call the difference between these two impacts the delta-impact. If the delta-impact is empty, then there is no indicator of a semantic merge conflict and the merge can continue automatically. Otherwise, the delta-impact contains what are the sources of possible conflicts.

Mots clés

Fichier principal
Vignette du fichier
main.pdf (305.85 Ko) Télécharger le fichier
Origine : Fichiers produits par l'(les) auteur(s)

Dates et versions

hal-01199035 , version 1 (14-09-2015)

Identifiants

Citer

Martín Dias, Guillermo Polito, Damien Cassou, Stéphane Ducasse. DeltaImpactFinder: Assessing Semantic Merge Conflicts with Dependency Analysis. International Workshop on Smalltalk Technologies 2015, ESUG, Jul 2015, Brescia, Italy. ⟨10.1145/2811237.2811299⟩. ⟨hal-01199035⟩
237 Consultations
127 Téléchargements

Altmetric

Partager

Gmail Facebook X LinkedIn More