Pragmatic Guide to Subversion by Mike Mason

Author:Mike Mason
Language: eng
Format: epub, pdf
Tags: Pragmatic Bookshelf
Publisher: Pragmatic Bookshelf

Task 21, ​Viewing the Log​

Task 18, ​Handling Conflicts​

Part 5

Branching, Merging, and Tagging

Real-world software projects are rarely straightforward and easy. The team must develop the software, stabilize it ready to be released into production, and support it once it’s in production. We’ve shown how a team can use Subversion to collaborate during development; this chapter will focus on how a team can release and support their software.

Usually when a team is preparing to release their software, they want to focus on quality. The team might decide to fix bugs and improve performance rather than adding new features. Generally, though, the team will want to continue some forward momentum. Maybe the team will split, with some developers working on stabilizing the code for release and everyone else developing as normal.

These two activities, stabilization and adding new features, generally cannot be done in the same code base. It’s very likely that the new features will add instability to the software, which is exactly what we don’t want when we’re trying to put a release into production. The solution is to branch the code. Branching splits off a new line of development where stabilization and bug fixing can be done, while new features can continue to be added on the trunk. The following diagram shows the branch and the trunk visually:

Download

Copyright Disclaimer:
This site does not store any files on its server. We only index and link to content provided by other sites. Please contact the content providers to delete copyright contents if any and email us, we'll remove relevant links or contents immediately.