An Efficient Software Merging Technique for Preserving Semantics 


Vol. 13,  No. 2, pp. 223-234, Apr.  2006
10.3745/KIPSTD.2006.13.2.223


PDF
  Abstract

Branching and merging have been being the outstanding methods for SCM in terms of supporting parallel developments. Since well-known commercial merging tools based on textual merging have not detecting semantics conflicts, they can cause semantic errors in the result of merging. Although a lot of researches for detecting semantic conflict and merging up to recently, these researches have been doing individually. Therefore, it is necessary for a research detecting semantic conflict on textual merging and solving it. In this paper, we propose a new method for merging which preserve semantics on textual merging. The method merging two revisions from a source program is as follows:1) defining changing operations, which include Update, Delete, and Insert operation, per line on two revisions corresponding to the line in source program, 2) detecting textual conflicts and semantic conflict in terms of executional behaviors, 3) solving these conflicts before merging. So, the proposed method can be regarded as a hybrid method that combines a method of textual merging and a behavioral semantic merging.

  Statistics


  Cite this article

[IEEE Style]

J. S. Kim and C. Youn, "An Efficient Software Merging Technique for Preserving Semantics," The KIPS Transactions:PartD, vol. 13, no. 2, pp. 223-234, 2006. DOI: 10.3745/KIPSTD.2006.13.2.223.

[ACM Style]

Ji Sun Kim and Cheong Youn. 2006. An Efficient Software Merging Technique for Preserving Semantics. The KIPS Transactions:PartD, 13, 2, (2006), 223-234. DOI: 10.3745/KIPSTD.2006.13.2.223.