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

IEEE Transactions on Software Engineering

Volumn 28, Issue 5, 2002, Pages 449-462

  Mens, Tom ^a  

^a VRIJE UNIVERSITEIT BRUSSEL   (Belgium)

Author keywords

Conflict detection; Conflict resolution; Large scale software development; Merge conflicts; Software merging

Indexed keywords

COMPUTATIONAL COMPLEXITY; COMPUTER PROGRAMMING LANGUAGES; MERGING; SEMANTICS; SYNTACTICS;

SOFTWARE MERGING;

SOFTWARE ENGINEERING;

EID: 0036564990     PISSN: 00985589     EISSN: None     Source Type: Journal    
DOI: 10.1109/TSE.2002.1000449     Document Type: Review

References (68)

1. SunPro: Engineering a practical program development environment
2. Identifying conflicts during structural merge
3. A framework for shared applications with replicated architectures
4. CVS II: Parallelizing software development
5. On merging software extensions
6. Software merge models and methods
7. Software merge: Semantics of combining changes to programs
8. Program integration for languages with procedure calls
9. Computer supported cooperative software engineering with beyond-sniff
10. Syntactic software merging
11. Version models for software configuration management
12. Automated merging of software prototypes
13. Flexible conflict detection and management in collaborative applications
14. Concurrency control in groupware systems
15. The adele configuration manager
16. Detecting interference when merging specification evolutions
17. Cdiff: A syntax directed diff for C++ programs
18. Change-oriented version descriptions in EPOS
19. Identifying the semantic and textual differences between two versions of a program
20. Integrating non-interfering versions of programs
21. Interprocedural slicing using dependence graphs
22. The use of program dependence graphs in software engineering
23. A fast algorithm for computing longest common subsequences
24. Delta algorithms: An empirical evaluation
25. Semantic diff: A tool for summarizing the effects of modifications
26. The CM challenge: Configuration management that works
27. Computer-aided software engineering in a distributed workstation environment
28. Increasing productivity with a parallel configuration manager
29. Change-oriented versioning in a software engineering database
30. Operation-based merging
31. Heterogeneous configuration management with DSEE
32. On closed elements in closure algebras
33. Conditional graph rewriting as a domain-independent formalism for software evolution
34. Maintaining the consistency of class libraries during their evolution
35. A flexible object merging framework
36. Flexible diff-ing in a collaborative writing system
37. The program dependence graph in a software development environment
38. Infuse: A tool for automatically managing and coordinating source changes in large systems
39. The inscape environment
40. Parallel changes in large scale software development: An observational case study
41. Algebraic properties of program integration
42. Illustrating interference in interfering versions of programs
43. An efficient version model of software diagrams
44. Classes of recursively enumerable sets and their decision problems
45. The source code control system
46. Reuse contracts: Managing the evolution of reusable assets
47. The string-to-string correction problem with block moves
48. RCS: A system for version control
49. Tools for software configuration management
50. Program slicing
51. Structure-oriented merging of revisions of software documents
52. A program integration algorithm that accommodates semantics-preserving transformations
53. Identifying syntactic differences between two programs
54. How to merge program texts
55. Ripple effect analysis of software maintenance