arXivDaily arXiv每日学术速递 周一至周五更新
arXiv 2410.09934cs.SE
收藏

版本控制合并工具的评估

Evaluation of Version Control Merge Tools

Benedikt Schesch, Ryan Featherman, Kenneth J. Yang, Ben R. Roberts, Michael D. Ernst

AI总结:

本文评估了版本控制合并工具,提出结合测试套件、已删除分支和错误成本的新实验方法,并据此创建了一个在多数假设下优于以往工具的合并工具。

摘要:

诸如 Git 之类的版本控制系统需要一种方式来整合来自不同开发者或分支的更改。在给定的合并场景中,合并工具要么输出更改的干净整合,要么输出需要手动解决的冲突。如果干净整合保留了预期的程序行为,则它是正确的,否则是不正确的(例如,如果它导致测试失败)。手动解决会消耗开发者宝贵的时间,而纠正由不正确合并引入的缺陷成本更高。已经提出了新的合并工具,但尚未对它们进行相互评估。先前的评估没有正确区分正确和错误的合并,没有在现实的合并场景集上进行评估,并且/或者没有与最先进的工具进行比较。我们进行了更现实的评估。结果与先前的声明显著不同,澄清了事实并促进了更好的未来研究。我们的新颖实验方法结合了运行测试套件、检查已删除分支上的合并,以及考虑错误合并的成本。基于这些评估,我们创建了一个合并工具,在大多数假设下优于所有先前的工具。它处理实践中最常见的合并场景。

英文摘要:

A version control system, such as Git, requires a way to integrate changes from different developers or branches. Given a merge scenario, a merge tool either outputs a clean integration of the changes, or it outputs a conflict for manual resolution. A clean integration is correct if it preserves intended program behavior, and is incorrect otherwise (e.g., if it causes a test failure). Manual resolution consumes valuable developer time, and correcting a defect introduced by an incorrect merge is even more costly. New merge tools have been proposed, but they have not yet been evaluated against one another. Prior evaluations do not properly distinguish between correct and incorrect merges, are not evaluated on a realistic set of merge scenarios, and/or do not compare to state-of-the-art tools. We have performed a more realistic evaluation. The results differ significantly from previous claims, setting the record straight and enabling better future research. Our novel experimental methodology combines running test suites, examining merges on deleted branches, and accounting for the cost of incorrect merges. Based on these evaluations, we created a merge tool that out-performs all previous tools under most assumptions. It handles the most common merge scenarios in practice.

机构、总结、中文摘要均由AI分析而来,可能存在错误,请以论文正文为准。

↑