Abstract
In many software configuration management (SCM) systems, brnching 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 cosequences. 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.
This is a preview of subscription content, log in via an institution to check access.
Access this chapter
Tax calculation will be finalised at checkout
Purchases are for personal use only
Preview
Unable to display preview. Download preview PDF.
References
Atria Software, Inc. ClearCase MultiSite Manual, 1996.
Atria Software, Inc. Clearcase User’s Manual (Unix/Release 3.0), 1996.
P. Feiler. Configuration management models in commercial environments. Technical Report CMU/SEI-91-TR-7, Software Engineering Institute, Carnegie Mellon University, 1991.
C. Ghezzi, M. Jazayeri, and D. Mandrioli. Fundamentals of Software Engineering. Prentice Hall, 1991.
J. Hunt, F. Lamers, J. Reuter, and W. Tichy. Distributed configuration management via Java and the World Widc Web. In Proceedings of the International Conference on Software Engineering, 7th Workshop on Software Configuration Management, pages 161–174. Springer-Verlag, 1997. Also: Lecture Notes in Computer Science #i235.
D. Leblang. Managing the software development process with ClearGnide. In Proceedings of the International Conference on Software Engineering, 7th Workshop on Software Configuration Management, pages 66–80. Springer-Verlag, 1997. Also: Lecture Notes in Computer Science #1235. http://uuv.delorie.com/gnu/docs/cvs/cvs_toc.html ftp://psep.ai.mit.edu/pub/gnu/bash. Engineering, pages 364-370, December 1975.
R. Pesch. CVS-Concurrent Versions System.
C. Ramey and B. Fox. Bash Reference Manual.
M. Rochkind. The source code control system. IEEE Dansactions on Software
Author information
Authors and Affiliations
Rights and permissions
Copyright information
© 1999 Springer-Verlag Berlin Heidelberg
About this paper
Cite this paper
Buffenbarger, J., Gruell, K. (1999). A Branching/Merging Strtegy for Parallel Software Development. In: System Configuration Management. SCM 1999. Lecture Notes in Computer Science, vol 1675. Springer, Berlin, Heidelberg. https://doi.org/10.1007/3-540-48253-9_7
Download citation
DOI: https://doi.org/10.1007/3-540-48253-9_7
Published:
Publisher Name: Springer, Berlin, Heidelberg
Print ISBN: 978-3-540-66484-0
Online ISBN: 978-3-540-48253-6
eBook Packages: Springer Book Archive