A Branching/Merging Strategy for Parallel Software Development

Jim Buffenbarger; Kirk Gruell

doi:10.1007/3-540-48253-9_7

A Branching/Merging Strategy for Parallel Software Development

Jim Buffenbarger, Kirk Gruell

Computer Science Department

Research output: Chapter in Book/Report/Conference proceeding › Chapter

8 Scopus citations

Abstract

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. This 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.

Original language	American English
Title of host publication	System Configuration Management: 19th International Symposium, SCM-9 Toulouse, France, September 5–7, 1999 Proceedings
Editors	Jacky Estublier
Publisher	Springer Verlag
Pages	86-99
Number of pages	14
ISBN (Print)	354066484X, 9783540664840
DOIs	https://doi.org/10.1007/3-540-48253-9_7
State	Published - 1 Jan 1999
Event	9th International Symposium on System Configuration Management, SCM 1999 - Toulouse, France Duration: 5 Sep 1999 → 7 Sep 1999

Publication series

Name	0302-9743

Conference

Conference	9th International Symposium on System Configuration Management, SCM 1999
Country/Territory	France
City	Toulouse
Period	5/09/99 → 7/09/99

EGS Disciplines

Computer Sciences

Access to Document

10.1007/3-540-48253-9_7License: Unspecified

https://doi.org/10.1007/3-540-48253-9_7

Cite this

@inbook{6f04a330811d4d9285ef18225c83eee4,

title = "A Branching/Merging Strategy for Parallel Software Development",

abstract = " 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. This 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.",

author = "Jim Buffenbarger and Kirk Gruell",

note = "Publisher Copyright: {\textcopyright} Springer-Verlag Berlin Heidelberg 1999.; 9th International Symposium on System Configuration Management, SCM 1999 ; Conference date: 05-09-1999 Through 07-09-1999",

year = "1999",

month = jan,

day = "1",

doi = "10.1007/3-540-48253-9_7",

language = "American English",

isbn = "354066484X",

series = "0302-9743",

publisher = "Springer Verlag",

pages = "86--99",

editor = "Jacky Estublier",

booktitle = "System Configuration Management: 19th International Symposium, SCM-9 Toulouse, France, September 5–7, 1999 Proceedings",

address = "Germany",

}

Buffenbarger, J & Gruell, K 1999, A Branching/Merging Strategy for Parallel Software Development. in J Estublier (ed.), System Configuration Management: 19th International Symposium, SCM-9 Toulouse, France, September 5–7, 1999 Proceedings. 0302-9743, Springer Verlag, pp. 86-99, 9th International Symposium on System Configuration Management, SCM 1999, Toulouse, France, 5/09/99. https://doi.org/10.1007/3-540-48253-9_7

TY - CHAP

T1 - A Branching/Merging Strategy for Parallel Software Development

AU - Buffenbarger, Jim

AU - Gruell, Kirk

N1 - Publisher Copyright: © Springer-Verlag Berlin Heidelberg 1999.

PY - 1999/1/1

Y1 - 1999/1/1

N2 - 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. This 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.

AB - 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. This 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.

UR - https://scholarworks.boisestate.edu/cs_facpubs/59

UR - https://doi.org/10.1007/3-540-48253-9_7

UR - http://www.scopus.com/inward/record.url?scp=84958972479&partnerID=8YFLogxK

U2 - 10.1007/3-540-48253-9_7

DO - 10.1007/3-540-48253-9_7

M3 - Chapter

SN - 354066484X

SN - 9783540664840

T3 - 0302-9743

SP - 86

EP - 99

BT - System Configuration Management: 19th International Symposium, SCM-9 Toulouse, France, September 5–7, 1999 Proceedings

A2 - Estublier, Jacky

PB - Springer Verlag

T2 - 9th International Symposium on System Configuration Management, SCM 1999

Y2 - 5 September 1999 through 7 September 1999

ER -

A Branching/Merging Strategy for Parallel Software Development

Abstract

Publication series

Conference

EGS Disciplines

Access to Document

Other files and links

Fingerprint

Cite this