Extensible language-aware merging

Conference on Software Maintenance

Volumn , Issue , 2002, Pages 511-520

  Hunt, James J ^a   Tichy, Walter F ^b  

^a FZI RESEARCH CENTER FOR INFORMATION TECHNOLOGY   (Germany)

^b UNIVERSITY OF KARLSRUHE   (Germany)

Author keywords

[No Author keywords available]

Indexed keywords

ALGORITHMS; APPROXIMATION THEORY; COMPUTER PROGRAM LISTINGS; JAVA PROGRAMMING LANGUAGE; SEMANTICS; SYNTACTICS;

EXTENSIBLE LANGUAGE-AWARE MERGING (ELAM);

SOFTWARE ENGINEERING;

EID: 0036438209     PISSN: None     EISSN: None     Source Type: Conference Proceeding    
DOI: None     Document Type: Conference Paper

References (16)

1. D. Binkley, S. Horwitz, and T. Reps. Program integration for languages with procedure calls. ACM Trans. on Software Eng. and Methodology, 4(1):3-35, Jan. 1995.
2. J. Buffenbarger. Syntactic software merging. Lecture Notes in Comp. Sci., 1005: ICSE SCM-4 and SCM-5 Workshop Sel. Papers:53-57, 1995.
3. S. Horwitz, J. Prins, and T. Reps. Integrating non-interfering versions of programs. ACM Trans. on Programming Languages and Systems, 11(3):345-387, July 1989.
4. J.J. Hunt. Extensible, Language-Aware Differencing and Merging. PhD thesis, Universitt Karlsruhe, Nov. 2001.
5. J.J. Hunt, K.-P. Vo, and W.F. Tichy. An empirical study of delta algorithms. ACM Trans. on Software Eng. and Methodology, 7(2):49-66, 1998.
6. J.W. Hunt and T.G. Szymanski. A fast algorithm for computing longest common subsequences. Communications of the ACM, 20(5):350-353, May 1977.
7. R. Irving and C. Fraser. Two algorithms for the longest common subsequence of three (or more) strings. In U. Manber, Z. Galil, M. Crochemore, and A. Apostolico, editors, Proceedings of the 3rd Annual Symposium on Combinatorial Pattern Matching, number 644, pages 214-229. Springer-Verlag, 1992.
8. E. Lippe. Operation-based merging. In H. Weber, editor, Software Eng. Notes: Proc. of the 5th ACM SIGSOFT Symp. on Software Development Environments, pages 78-87. ACM, Dec. 1992.
9. G. Malpohl, J.J. Hunt, and W.F. Tichy. Renaming detection. In Proc. of the 15th Inter Conf. on Automated Software Eng. IEEE Computer Society Press, Sept. 2000.
10. E.M. McCreight. A space economical suffix tree construction algorithm. Journal of the ACM, 32:262-272, 1976.
11. E.W. Meyers. An o(nd) difference algorithm and its variations. Algorithmica, 1(2):251-266, 1986.
12. T. Parr and R. Quong. A Predicated-LL(k) parser generator. Software Practice and Experience, 25(7):789-810, July 1995.
13. T. Reps, S. Horwitz, and J. Prins. Support for integrating program variants in an environment for programming in the large, in Proc. of the Inter. Workshop on Software Version and Config. Control, Stuttgart, FRG, Jan. 1988. Teubner Verlag.
14. W.F. Tichy. RCS: A revision control system. In Integrated Interactive Computing Systems. North-Holland Publishing Co, 1983.
15. B. Westfechtel. Structure-oriented merging of revisions of software documents. In Proc. of the 3rd Inter Workshop on SCM, pages 68-79. ACM Press, 1991.
16. W. Yang, S. Horwitz, and T. Reps. A program integration algorithm that accommodates semantic-preserving transformations. ACM Trans. on Software Eng. and Methodology, 1(3):310-354, July 1992.