Pragmatic Version Control : Using Subversion

by Mason, Mike

• ISBN13: 9780977616657
• ISBN10: 0977616657
• Edition: 2nd
• Format: Paperback
• Copyright: 2006-07-30
• Publisher: Oreilly & Associates Inc

Summary

This book covers the theory behind version control and how it can help developers become more efficient, work better as a team, and keep on top of software complexity. Version control, done well, is your "undo" button for the project: nothing is final, and mistakes are easily rolled back. This book describes Subversion 1.3, the latest and hottest open source version control system, using a recipe-based approach that will get you up and running quickly - and correctly. Learn how to use Subversion the right way - the pragmatic way.

Table of Contents

Preface	xi
Introduction	1	(8)
Version Control in Action	2	(4)
Road Map	6	(1)
Why Choose Subversion	6	(3)
What is Version Control?	9	(20)
The Repository	9	(2)
What Should We Store?	11	(1)
Working Copies and Manipulating Files	12	(3)
Projects, Directories, and Files	15	(1)
Where Do Versions Come In?	16	(2)
Tags	18	(1)
Branches	19	(3)
Merging	22	(1)
Locking Options	23	(3)
Configuration Management (CM)	26	(3)
Getting Started with Subversion	29	(24)
Installing Subversion	29	(5)
Creating a Repository	34	(1)
Creating a Simple Project	35	(3)
Starting to Work with a Project	38	(2)
Making Changes	40	(2)
Updating the Repository	42	(3)
When Worlds Collide	45	(3)
Conflict Resolution	48	(5)
How To...	53	(4)
Our Basic Philosophy	54	(1)
Important Steps When Using Version Control	54	(3)
Accessing a Repository	57	(8)
Network Protocols	57	(5)
Choosing a Networking Option	62	(3)
Common Subversion Commands	65	(38)
Checking Things Out	65	(2)
Keeping Up-to-Date	67	(2)
Adding Files and Directories	69	(1)
Properties	69	(9)
Copying and Moving Files and Directories	78	(5)
Seeing What Has Changed	83	(6)
Handling Merge Conflicts	89	(5)
Committing Changes	94	(1)
Examining Change History	94	(4)
Removing a Change	98	(5)
File Locking and Binary Files	103	(8)
File Locking Overview	103	(1)
File Locking in Practice	104	(6)
When to use Locking	110	(1)
Organizing Your Repository	111	(4)
A Simple Project	111	(1)
Multiple Projects	112	(1)
Multiple Repositories	113	(2)
Using Tags and Branches	115	(18)
Tags and Branches	116	(3)
Creating a Release Branch	119	(2)
Working in a Release Branch	121	(2)
Generating a Release	123	(2)
Fixing Bugs in a Release Branch	125	(3)
Developer Experimental Branches	128	(2)
Working with Experimental Code	130	(1)
Merging the Experimental Branch	130	(3)
Creating a Project	133	(14)
Creating the Initial Project	134	(2)
Structure within the Project	136	(4)
Sharing Code between Projects	140	(7)
Third-Party Code	147	(10)
Binary Libraries	147	(3)
Libraries with Source Code	150	(6)
Keyword Expansion during Imports	156	(1)
A. Install, Network, Secure, and Administer	157	(24)
Installing Subversion	157	(2)
Networking with svnserve	159	(1)
Networking with svn+ssh	160	(3)
Networking with Apache	163	(6)
Securing Subversion	169	(7)
Backing Up Your Repository	176	(5)
B. Migrating to Subversion	181	(4)
Getting cvs2svn	182	(1)
Choosing How Much to Convert	182	(1)
Converting Your Repository	183	(2)
C. Third-Party Subversion Tools	185	(10)
TortoiseSVN	185	(7)
IDE Integration	192	(1)
Other Tools	193	(2)
D. Advanced Topics	195	(10)
Programmatic Access to Subversion	195	(5)
Advanced Repository Management	200	(5)
E. Command Summary and Recipes	205	(18)
Subversion Command Summary	205	(11)
Recipes	216	(7)
F. Other Resources	223	(1)
Online Resources	223	(1)
Bibliography	224