作者: Jiahong Jiang , Xiaoguang Mao , Tao Ji , Liqian Chen , Xin Yi
DOI:
关键词:
摘要: Merging other branches into the current working branch is common in collaborative software development. However, developers still heavily rely on textual merge tools to handle complicated tasks. The latent semantic conflicts may fail be detected and degrade quality. Regression testing able prevent regression faults has been widely used real-world merged well examined by rerunning existing whole test suite. Intuitively, if suite fails cover changes of different at same time, would detected. Recently, it proposed conduct verification 3-way merges, but this approach does not support even some cases such as made parts program. In paper, we propose an unit generation specifically for checking program merges according our oracles. And general oracles us examine only also 2-way octopus merges. Considering arise locations besides changed methods project, design algorithm select UUTs based dependency analysis project. On basis, implement a tool called TOM generate tests Java We benchmark MCon4J consisting 389 conflict facilitate further studies topic. experimental results show that finds 45 3- way 87 while work MCon4J.