Skip to Main Content
Version Control with Subversion, 2nd Edition
book

Version Control with Subversion, 2nd Edition

by C. Michael Pilato, Ben Collins-Sussman, Brian W. Fitzpatrick
September 2008
Intermediate to advanced content levelIntermediate to advanced
432 pages
13h 57m
English
O'Reilly Media, Inc.
Content preview from Version Control with Subversion, 2nd Edition

Chapter 4. Branching and Merging

 

君子务本 (It is upon the Trunk that a gentleman works.)

 
 --Confucius

Branching, tagging, and merging are concepts common to almost all version control systems. If you’re not familiar with these ideas, we provide a good introduction in this chapter. If you are familiar, hopefully you’ll find it interesting to see how Subversion implements them.

Branching is a fundamental part of version control. If you’re going to allow Subversion to manage your data, this is a feature you’ll eventually come to depend on. This chapter assumes that you’re already familiar with Subversion’s basic concepts (see Chapter 1).

What’s a Branch?

Suppose it’s your job to maintain a document for a division in your company—a handbook of some sort. One day a different division asks you for the same handbook, but with a few parts tweaked for them, since they do things slightly differently.

What do you do in this situation? You do the obvious: make a copy of your document and begin maintaining the two copies separately. As each department asks you to make small changes, you incorporate them into one copy or the other.

You often want to make the same change to both copies. For example, if you discover a typo in the first copy, it’s very likely that the same typo exists in the second copy. The two documents are almost the same, after all; they differ only in small, specific ways.

This is the basic concept of a branch—namely, a line of development that exists independently of another line, ...

Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Start your free trial

You might also like

Subversion Version Control: Using The Subversion Version Control System in Development Projects

Subversion Version Control: Using The Subversion Version Control System in Development Projects

William Nagel
Version Control with Git, 3rd Edition

Version Control with Git, 3rd Edition

Prem Kumar Ponuthorai, Jon Loeliger

Publisher Resources

ISBN: 9780596510336Errata Page