Effective Software Merging in the Presence of Object-Oriented Refactorings

Authors:
Danny Dig;Kashif Manzoor;Ralph E. Johnson;Tien N. Nguyen
Affiliations:
University of Illinois at Urbana-Champaign, Urbana;University of Illinois at Urbana-Champaign, Urbana;University of Illinois at Urbana-Champaign, Urbana;Iowa State University, Ames
Venue:
IEEE Transactions on Software Engineering
Year:
2008

Citing 0
Cited 11

Perspectives on automated correction of bad smells

Proceedings of the joint international and annual ERCIM workshops on Principles of software evolution (IWPSE) and software evolution (Evol) workshops
Towards accurate conflict detection in a VCS for model artifacts: a comparison of two semantically enhanced approaches

APCCM '09 Proceedings of the Sixth Asia-Pacific Conference on Conceptual Modeling - Volume 96
Patching product line programs

FOSD '10 Proceedings of the 2nd International Workshop on Feature-Oriented Software Development
A recommender for conflict resolution support in optimistic model versioning

Proceedings of the ACM international conference companion on Object oriented programming systems languages and applications companion
Software development is program transformation

Proceedings of the FSE/SDP workshop on Future of software engineering research
Conflicts as first-class entities: a UML profile for model versioning

MODELS'10 Proceedings of the 2010 international conference on Models in software engineering
Historage: fine-grained version control system for Java

Proceedings of the 12th International Workshop on Principles of Software Evolution and the 7th annual ERCIM Workshop on Software Evolution
An introduction to model versioning

SFM'12 Proceedings of the 12th international conference on Formal Methods for the Design of Computer, Communication, and Software Systems: formal methods for model-driven engineering
A posteriori operation detection in evolving software models

Journal of Systems and Software
Turning Conflicts into Collaboration

Computer Supported Cooperative Work
Search-based model merging

Proceedings of the 15th annual conference on Genetic and evolutionary computation

Quantified Score

Hi-index	0.00

Visualization

Abstract

Current text based Software Configuration Management (SCM) systems have trouble with refactorings. Refactorings result in global changes which lead to merge conflicts. A refactoring-aware SCM system reduces merge conflicts. This paper describes MolhadoRef, a refactoring-aware SCM system and the merge algorithm at its core. MolhadoRef records change operations (refactorings and edits) used to produce one version, and replays them when merging versions. Since refactorings are change operations with well defined semantics, MolhadoRef treats them intelligently. A case study and a controlled experiment show that MolhadoRef automatically solves more merge conflicts than CVS while resulting in fewer merge errors.