DeltaImpactFinder: Assessing Semantic Merge Conflicts with Dependency Analysis

Martín Dias 1 Guillermo Polito 1 Damien Cassou 1 Stéphane Ducasse 1
1 RMOD - Analyses and Languages Constructs for Object-Oriented Application Evolution
Inria Lille - Nord Europe, CRIStAL - Centre de Recherche en Informatique, Signal et Automatique de Lille (CRIStAL) - UMR 9189
Abstract : 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.
Keywords : PHARO
Complete list of metadatas

https://hal.inria.fr/hal-01199035
Contributor : Lse Lse <>
Submitted on : Monday, September 14, 2015 - 6:15:57 PM
Last modification on : Friday, March 22, 2019 - 1:34:55 AM
Long-term archiving on : Tuesday, December 29, 2015 - 6:51:42 AM

Files

main.pdf
Files produced by the author(s)

Identifiers

Collections

Citation

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⟩

Share

Metrics

Record views

530

Files downloads

157