Renaming and shifted code in structured merging: Looking ahead for precision and performance

Lesenich, Olaf; Apel, Sven; Kästner, Christian; Seibt, Georg; Siegmund, Janet

doi:10.1109/ase.2017.8115665

Cited by 13 publications

(14 citation statements)

References 25 publications

Supporting

Mentioning

Contrasting

Order By: Relevance

“…Correctness Checking. Lines of merged code is a common criterion [Apel et al 2011;Leßenich et al 2017Leßenich et al , 2015 to measure the performance of a merge tool. However, the criterion is inappropriate for our VSA-based approach, for the reason that every conflict can be resolved by arbitrarily choosing one candidate resolution as the merged result.…”

Section: Methodsmentioning

confidence: 99%

See 1 more Smart Citation

Conflict resolution for structured merge via version space algebra

Zhu

2018

Proc. ACM Program. Lang.

View full text Add to dashboard Cite

Resolving conflicts is the main challenge for software merging. The existing merge tools usually rely on the developer to manually resolve conflicts. This is of course inefficient. We propose an interactive approach for resolving merge conflicts. To the best of our knowledge, this is the first attempt for conflict resolution of structured merge. To represent the possibly very large set of candidate programs, we propose an expressive and efficient representation by version space algebra. We also design a simple mechanism for ranking resolutions in the program space, such that the top-ranked resolution is very likely to meet the developer's expectation. We prototype our approach as a merge tool AutoMerge, and evaluate it on 244 real-world conflicts arising from 10 open-source projects. Results show great practicality of our approach. CCS Concepts: • Software and its engineering → Software version control; Context specific languages;

show abstract

Section: Methodsmentioning

confidence: 99%

“…Based on JDime, we propose a VSA-based approach to resolve conflicts and enhance the overall merge precision. Leßenich et al [2017] propose a syntax-aware, heuristic optimization for JDime by introducing a looking ahead mechanism during tree matching. Their approach intends to handle shifted code and renaming uniformly.…”

Section: Related Work 71 Software Mergementioning

confidence: 99%

Conflict resolution for structured merge via version space algebra

Zhu

2018

Proc. ACM Program. Lang.

View full text Add to dashboard Cite

show abstract

“…This structure is used for generating symbol tables for compilers and later code generation. The tree represents all of the constructs in the language and their subsequent rules [28]. For instance, a syntactic construct like an if-condition-then expression may be denoted by means of a single node with three branches.…”

Section: Structured Merge Toolsmentioning

confidence: 99%

“…The structured merge tools are aware of what kind of source code that deals it, and, therefore, can present better solutions when it comes to conflict handling. But the limitations of structured merge tools are expensive when computing ASTs [28].…”

Section: Structured Merge Toolsmentioning

confidence: 99%

Merging problems in modern version control systems

Khleel

Nehéz

2020

MDT

View full text Add to dashboard Cite

During software development, when developers change the same part of the code concurrently, this may be led to merging conflicts. Resolving these conflicts might be costly and time-consuming. Three types of conflicts may arise during merge processes: textual, syntactic, and semantic. Textual conflicts occur when merging a concurrent operation, such as addition, removal or edition take place over the same parts of code. Syntactic conflicts occur when concurrent operations break the syntactic structure of the source code files when merged. Finally, a semantic conflict occurs when the merged modification is compiled without error but malfunctions. Version management systems usually use textual merging technique; users can synchronize their modifications with other users working in parallel with them, in this process, a merge is performed between local modifications and remote modifications. The previous work has examined different mechanisms to detect and resolve conflicts and proposed different tools for resolving merge conflicts, such as two-way merging, three-way merging, state-based merging, and operation-based merging. This paper discusses and investigates many concepts related to merging conflicts by asking and answering these questions; what are the factors that most affect in a merge conflict, how to avoiding and reducing merge conflicts, how to detecting merge conflicts, and how to resolve them.

show abstract

“…This fact prevents any large scale validation on real code as the one performed in this submission. We therefore propose a formalism that matches the state‐of‐practice associated to the Linux and Java ecosystems: (a) an action‐based representation of code modifications (supported by approaches such as Praxis or Adore), and (b) a diff‐based mechanism at the Abstract Syntax Tree (AST) level when necessary (supported by GumTree or JDime tools). For more information about these related works, we kindly ask the reader to read Section .…”

Section: Introductionmentioning

confidence: 99%

A delta‐oriented approach to support the safe reuse of black‐box code rewriters

Benni

Mosser

Moha

et al. 2019

J Software Evolu Process

View full text Add to dashboard Cite

Large-scale corrective and perfective maintenance is often automated thanks to rewriting rules using tools such as Python2to3, Spoon, or Coccinelle. Such tools consider these rules as black-boxes and compose multiple rules by chaining them: giving the output of a given rewriting rule as input to the next one. It is up to the developer to identify the right order (if it exists) among all the different rules to yield the right program. In this paper, we define a formal model compatible with the black-box assumption that reifies the modifications (Δs) made by each rule. Leveraging these Δs, we propose a way to safely compose multiple rules when applied to the same program by (a) ensuring the isolated application of the different rules and (b) identifying unexpected behaviors that were silently ignored before. We assess this approach on two large-scale case studies: (a) identifying conflicts in the Linux source-code automated maintenance and (b) fixing energy antipatterns existing in Android applications available on GitHub.

show abstract

Renaming and shifted code in structured merging: Looking ahead for precision and performance

Cited by 13 publications

References 25 publications

Conflict resolution for structured merge via version space algebra

Conflict resolution for structured merge via version space algebra

Merging problems in modern version control systems

A delta‐oriented approach to support the safe reuse of black‐box code rewriters

Contact Info

Product

Resources

About