Issue No. 03 - May/June (2008 vol. 34)
DOI Bookmark: http://doi.ieeecomputersociety.org/10.1109/TSE.2008.29
Danny Dig , University of Illinois at Urbana-Champaign, Urbana
Kashif Manzoor , University of Illinois at Urbana-Champaign, Urbana
Ralph E. Johnson , University of Illinois at Urbana-Champaign, Urbana
Tien N. Nguyen , Iowa State University, Ames
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.
Configuration Management, Restructuring, reverse engineering, and reengineering, Version control
T. N. Nguyen, D. Dig, K. Manzoor and R. E. Johnson, "Effective Software Merging in the Presence of Object-Oriented Refactorings," in IEEE Transactions on Software Engineering, vol. 34, no. , pp. 321-335, 2008.