Subversion: The Definitive Guide by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Michael Pilato Subversion: The Definitive Guide by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Michael Pilato Published (TBA) Table of Contents Preface......................................................................................................................................... What is Subversion .................................................................................................................1 How This Book is Organized .................................................................................................... 1 Conventions used in this book .................................................................................................. 1 Comments and Questions ........................................................................................................1 Acknowledgements ................................................................................................................1 1.Introduction ............................................................................................................................... Revision Control (and what svn can do for you) ........................................................................... 2 Targetaudience .....................................................................................................................2 History.................................................................................................................................2 History of Revision Control ............................................................................................. 2 History of Subversion .....................................................................................................2 Feature list (why svn is so nice) ................................................................................................ 2 How to get svn binaries ........................................................................................................... 3 How to get this book and send patches for it. ............................................................................... 3 2.BasicConcepts ........................................................................................................................... TheRepository ......................................................................................................................4 VersioningModels .................................................................................................................5 The Problem of File-Sharing ............................................................................................ 5 The Lock-Modify-Unlock Solution ....................................................................................5 The Copy-Modify-Merge Solution ....................................................................................7 Subversion in action ...............................................................................................................8 Workingcopies .............................................................................................................8 Revisions......................................................................................................................10 How working copies track the repository ............................................................................ 12 Summary..............................................................................................................................12 3.GuidedTour .............................................................................................................................. Help! ...................................................................................................................................14 Import..................................................................................................................................14 InitialCheckout .....................................................................................................................14 BasicWorkcycle ....................................................................................................................15 Update Your Working Copy ............................................................................................. 15 Make Changes to Your Working Copy ............................................................................... 16 Examine Your Changes ...................................................................................................17 Resolving conflicts (Merging others' changes) ..................................................................... 21 Commit your changes .....................................................................................................23 ExaminingHistory .................................................................................................................24 svnlog .........................................................................................................................24 svndiff ........................................................................................................................25 svncat .........................................................................................................................26 RevisionNumbers ..................................................................................................................27 OtherCommands ...................................................................................................................28 svncleanup ...................................................................................................................28 svninfo ........................................................................................................................28 svnimport ....................................................................................................................28 svnexport.....................................................................................................................29 svnlist .........................................................................................................................29 svnmkdir .....................................................................................................................30 4. Branching and Merging ............................................................................................................... What'sabranch? ....................................................................................................................31 Usingbranches ......................................................................................................................32 Creating a branch ...........................................................................................................33 Working with your branch ............................................................................................... 35 iv Subversion: The Definitive Guide The moral of the story ..................................................................................................... 37 Copying changes between branches ........................................................................................... 37 Removing a change from the repository ...................................................................................... 39 Tags ....................................................................................................................................40 Branchmaintenance ...............................................................................................................41 Switching a working copy ........................................................................................................ 42 Summary..............................................................................................................................43 5. Repository Administration ............................................................................................................ RepositoryBasics...................................................................................................................44 Understanding Transactions and Revisions .......................................................................... 44 UnversionedProperties ...................................................................................................45 Repository Creation and Configuration ....................................................................................... 45 Hookscripts ..................................................................................................................46 Berkeley DB configuration ..............................................................................................48 RepositoryMaintenance ..........................................................................................................48 An Administrator's Toolkit ...............................................................................................48 RepositoryCleanup ........................................................................................................53 Repositoryrecovery ........................................................................................................55 Migrating a repository .....................................................................................................56