Supporting streams of changes during branch integration

Gómez, Verónica Uquillas; Ducasse, Sté́phane; Kellens, Andy

doi:10.1016/j.scico.2014.07.012

Cited by 3 publications

(2 citation statements)

References 19 publications

Supporting

Mentioning

Contrasting

Order By: Relevance

“…The final category of questions is related to situating changes within the context of a sequence of changes, as well as to the time at which the changes occur. Indeed, often a change does not happen in isolation, other changes may depend on it and fork analysis requires to understand change dependencies [UGDK14]. In particular, when working on a sequence of changes, these questions capture the place of a change within the sequence.…”

Section: Authorship/ownership Questionsmentioning

confidence: 99%

“…For example, the cherrypick of a method modification which adds a reference to a class that does not exist in the destination branch will lead to a compilation error. Since a commit can depend on other commits, and the identification of such dependencies is a complex task, the support from tools is important [UGDK14]. The following questions capture such problems.…”

Section: Understanding Change Dependencies When Cherrypickingmentioning

confidence: 99%

See 1 more Smart Citation

Do Tools Support Code Integration? A Survey.

Dias¹,

Ducasse²,

Cassou³

et al. 2016

JOT

Self Cite

View full text Add to dashboard Cite

Integrating changes made by other developers is a difficult and tedious process. To understand how to help integrators, we first need to know the main questions they ask themselves while integrating and then relate these questions to the tool support that is needed. With this information, researchers and tool developers will be able to focus on the important questions that have little tool support.In this paper, we report on a 2-step study. In the first step, we did an open call to integrators. We ask them to list questions they ask themselves when they integrate a change. In the second step, based on the questions gathered during the first step and a literature survey, we built a list of 46 questions and run a survey to rank the importance of each question and if the level of tool support was adequate. We present the results we collected. Additionally, we present a taxonomy of the questions according to the kind of information that tools need to answer such questions.We found out that some questions like "Who is the author of this changed code?" are important and have good tool support whereas others like "Do all the changes within the commit belong together? (Can we split the commit?)" are moderately to extremely important and have no tool support.

show abstract

Section: Authorship/ownership Questionsmentioning

confidence: 99%

Section: Understanding Change Dependencies When Cherrypickingmentioning

confidence: 99%

Do Tools Support Code Integration? A Survey.

Dias¹,

Ducasse²,

Cassou³

et al. 2016

JOT

Self Cite

View full text Add to dashboard Cite

show abstract

Querying distilled code changes to extract executable transformations

Stevens¹,

Molderez

Roover

2018

Empir Software Eng

View full text Add to dashboard Cite

General rightsCopyright and moral rights for the publications made accessible in the public portal are retained by the authors and/or other copyright owners and it is a condition of accessing publications that users recognise and abide by the legal requirements associated with these rights.• Users may download and print one copy of any publication from the public portal for the purpose of private study or research. • You may not further distribute the material or use it for any profit-making activity or commercial gain • You may freely distribute the URL identifying the publication in the public portal Take down policy If you believe that this document breaches copyright please contact us providing details, and we will remove access to the work immediately and investigate your claim.

show abstract

DeltaImpactFinder

Dias

Polito

Cassou

et al. 2015

Proceedings of the International Workshop on Smalltalk Technologies

Self Cite

View full text Add to dashboard Cite

In software development, version control systems (VCS) provide branching and merging support tools. Such tools are popular among developers to concurrently change a codebase 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.

show abstract

Supporting streams of changes during branch integration

Cited by 3 publications

References 19 publications

Do Tools Support Code Integration? A Survey.

Do Tools Support Code Integration? A Survey.

Querying distilled code changes to extract executable transformations

DeltaImpactFinder

Contact Info

Product

Resources

About