RCS—a system for version control
Software—Practice & Experience
Fundamentals of software engineering
Fundamentals of software engineering
Change Sets Versus Change Packages: Comparing Implementations of Change-Based SCM
ICSE '97 Proceedings of the SCM-7 Workshop on System Configuration Management
Managing the Software Development Process with ClearGuide
ICSE '97 Proceedings of the SCM-7 Workshop on System Configuration Management
Distributed Configuration Management via Java and the World Wide Web
ICSE '97 Proceedings of the SCM-7 Workshop on System Configuration Management
High-Level Best Practices in Software Configuration Management
ECOOP '98 Proceedings of the SCM-8 Symposium on System Configuration Management
Proceedings of the 2011 International Conference on Software and Systems Process
Cohesive and isolated development with branches
FASE'12 Proceedings of the 15th international conference on Fundamental Approaches to Software Engineering
The effect of branching strategies on software quality
Proceedings of the ACM-IEEE international symposium on Empirical software engineering and measurement
| Hi-index | 0.00 |
In many software configuration management (SCM) systems, branching and merging are fundamental operations, supporting isolation and integration (respectively). Unfortunately, the obvious branching and merging strategies have unpleasant consequences. This paper presents a less obvious branching and merging strategy, for parallel software development, which does not suffer these consequences. In particular, it presents a way of updating an active branch from a new baseline. The strategy can be described as "merging at a label." It has been successful at managing unnecessary branch proliferation and change isolation in an industrial SCM environment.