Branching and merging in the repository

TitleBranching and merging in the repository
Publication TypeConference Paper
Year of Publication2008
AuthorsSpacco, Jamie, and Williams Chadd C.
Tertiary AuthorsHassan, Ahmed E., Lanza Michele, and Godfrey Michael W.
Secondary Titlethe 2008 international workshopProceedings of the 2008 international workshop on Mining software repositories - MSR '08
Pagination19-22
Date Published05/2008
PublisherACM Press
Place PublishedNew York, New York, USA
ISBN Number9781605580241
Keywordsargouml, changes, cvs2svn, diffj, revision, scm, source code, version control
Abstract

Two of the most complex operations version control software allows a user to perform are branching and merging. Branching provides the user the ability to create a copy of the source code to allow changes to be stored in version control but outside of the trunk. Merging provides the user the ability to copy changes from a branch to the trunk. Performing a merge can be a tedious operation and one that may be error prone. In this paper, we compare file revisions found on branches with those found on the trunk to determine when a change that is applied to a branch is moved to the trunk. This will allow us to study how developers use merges and to determine if merges are in fact more error prone than other commits.

DOI10.1145/1370750.1370754
AttachmentSize
p19-williams.pdf280.51 KB