DocumentCode :
2983937
Title :
Extensible language-aware merging
Author :
Hunt, James J. ; Tichy, Walter F.
Author_Institution :
Forschungszentrum Informatik, Karlsruhe, Germany
fYear :
2002
fDate :
2002
Firstpage :
511
Lastpage :
520
Abstract :
Parallel development has become standard practice in software development and maintenance. Though almost every revision control and configuration management system provides some form of merging for combining changes made in parallel, these mechanisms often yield unsatisfactory results. The authors present a new merging algorithm, that uses a fast differencing algorithm and renaming analysis to provide better merge results. The system is language aware, but not language dependent and does not require a special editor so it can be easily integrated in current development environments.
Keywords :
configuration management; merging; software development management; software maintenance; configuration management system; extensible language-aware merging; fast differencing algorithm; renaming analysis; revision control; software development; software maintenance; Algorithm design and analysis; Control systems; Interference; Merging; Programming; Software maintenance; Software standards; Standards development;
fLanguage :
English
Publisher :
ieee
Conference_Titel :
Software Maintenance, 2002. Proceedings. International Conference on
ISSN :
1063-6773
Print_ISBN :
0-7695-1819-2
Type :
conf
DOI :
10.1109/ICSM.2002.1167812
Filename :
1167812
Link To Document :
بازگشت