SunPro engineering a practical program development environment

Adams, Evan; Gramlich, Wayne C.; Muchnick, Steven S.

doi:10.1007/3-540-17189-4_91

Cited by 6 publications

(1 citation statement)

References 1 publication

Supporting

Mentioning

Contrasting

Order By: Relevance

“…The most common approach is to use line-based merging, where lines of text are taken as indivisible units [27]. Examples of this are the rcsmerge tool in the Revision Control System (RCS) [60], Sun 1 's filemerge tool [1], the DOMAIN Software Engineering Environment (DSEE) [33], [34], [37], the Concurrent Version System (CVS) [4], and merge tools that can be found in commercial configuration management tools. With line-based merging of text files, common text lines can be detected in parallel modifications, as well as text lines that have been inserted, deleted, modified, or moved.…”

Section: Textual Mergingmentioning

confidence: 99%

A state-of-the-art survey on software merging

Mens

2002

IIEEE Trans. Software Eng.

409

345

View full text Add to dashboard Cite

AbstractÐSoftware merging is an essential aspect of the maintenance and evolution of large-scale software systems. This paper provides a comprehensive survey and analysis of available merge approaches. Over the years, a wide variety of different merge techniques has been proposed. While initial techniques were purely based on textual merging, more powerful approaches also take the syntax and semantics of the software into account. There is a tendency towards operation-based merging because of its increased expressiveness. Another tendency is to try to define merge techniques that are as general, accurate, scalable, and customizable as possible, so that they can be used in any phase in the software life-cycle and detect as many conflicts as possible. After comparing the possible merge techniques, we suggest a number of important open problems and future research directions.

show abstract