(Compiled from r5745) For Subversion 1 - Red Bean

1 Version Control with SubversionFor Subversion (Compiled from r5745) Ben Collins-SussmanBrian W. FitzpatrickC. Michael PilatoVersion Control with Subversion : For Subversion : (Compiled from r5745) by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Michael PilatoCopyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ben Collins-Sussman, Brian W. Fitzpatrick, C. MichaelPilatoThis work is licensed under the Creative Commons Attribution License. To view a copy of this license, visit or send aletter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, of xiiiWhat Is Subversion ?

2 XiiiIs Subversion the Right Tool?.. xiiiSubversion's xivSubversion's xvSubversion's xviiWhat's New in xviiiHow to Read This xixOrganization of This xxThis Book Is xxi1. Fundamental 1 Version Control 1 The 1 The Working 2 Versioning 2 Version Control the Subversion 7 Subversion 7 Addressing the 8 Subversion Working 142. Basic 15 Help!.. 15 Getting Data into Your 16 Importing Files and 16 Recommended Repository 17 What's In a Name?.. 17 Creating a Working 18 Basic Work 19 Update Your Working 20 Make Your 20 Review Your 21 Fix Your 25 Resolve Any 26 Commit Your 32 Examining 33 Examining the Details of Historical 34 Generating a List of Historical 35 Browsing the 37 Fetching Older Repository 39 Sometimes You Just Need to Clean 40 Disposing of a Working 40 Recovering from an 40 Dealing with Structural 41An Example Tree 463.

3 Advanced 47 Revision 47 Version Control with SubversionivRevision 47 Revision 48 Peg and Operative 53 Why Properties?.. 54 Manipulating 55 Properties and the Subversion 58 Automatic Property 60 File 60 File Content 61 File 62 End-of-Line Character 62 Ignoring Unversioned 63 Keyword 67 Sparse 75 Creating 76 Discovering 78 Breaking and Stealing 79 Lock 81 Externals 87 Creating and Modifying 88 Changelists As Operation 90 Changelist 91 Network 91 Requests and 92 Client 954. Branching and 96 What's a Branch?

4 96 Using 96 Creating a 98 Working with Your 99 The Key Concepts Behind 102 Basic 102 Keeping a Branch in 103 Subtree Merges and Subtree 106 Reintegrating a 108 Mergeinfo and 110 Undoing 114 Resurrecting Deleted 115 Advanced 116 Merge Syntax: Full 118 Merges Without 119 More on Merge 120 Blocking 122 Keeping a Reintegrated Branch 123 Merge-Sensitive Logs and 124 Noticing or Ignoring 126 Merges and 127 Preventing Na ve Clients from Committing 127 Version Control with SubversionvThe Final Word on Merge 128 Traversing 130 Creating a Simple 131 Creating a Complex 131 Branch 132 Repository 132 Data 133 Common Branching 133 Release 134 Feature 134 Vendor 135 General Vendor Branch Management 137To Branch or Not to Branch?

5 1395. Repository 141 The Subversion Repository, 141 Strategies for Repository 142 Planning Your Repository 142 Deciding Where and How to Host Your 144 Choosing a Data 145 Creating and Configuring Your 147 Creating the 148 Implementing Repository 148 Berkeley DB 150 FSFS 150 Repository 150An Administrator's 150 Commit Log Message 154 Managing Disk 154 Berkeley DB 158 Migrating Repository Data 159 Filtering Repository 163 Repository 166 Repository 172 Managing Repository 174 Moving and Removing 1756.

6 Server 176 Choosing a Server 177 The svnserve 177svnserve over 177 The Apache HTTP 178svnserve, a Custom 179 Invoking the 179 Built-in Authentication and 183 Using svnserve with 185 Tunneling over 187 SSH Configuration 188httpd, the Apache HTTP 190 Version Control with SubversionviBasic Apache 190 Authentication 192 Authorization 195 Protecting network traffic with 198 Extra 200 Path-Based 207 High-level 211 Server 213 Data 213 Network Compression of 214 Supporting Multiple Repository Access 2147.

7 Customizing Your Subversion 216 Runtime Configuration 216 Configuration Area 216 Configuration and the Windows 217 Configuration 224 Understanding 224 Subversion 's Use of 225 Using External 226 Using External Differencing and Merge 227 External 227 External 228 External 2318. Embedding 232 Layered Library 232 Repository 233 Repository Access 236 Client 237 Using the 238 The Apache Portable Runtime 238 Functions and 239 URL and Path 239 Using Languages Other Than C and C++.. 240 Code 2469.

8 Subversion Complete 248svn Subversion Command-Line 248svn 248svn 256svnadmin Subversion Repository 330svnadmin 330svnadmin 332svnlook Subversion Repository 353svnlook 353svnlook 355svnsync Subversion Repository 375svnsync 375svnsync 377svnrdump Remote Subversion Repository Data 385svnrdump 385svnrdump 386svnserve Custom Subversion 389 Version Control with Subversionviisvnserve 390svndumpfilter Subversion History 391svndumpfilter 391svndumpfilter 392svnversion Subversion Working Copy Version 397mod_dav_svn Subversion Apache HTTP Server 399mod_authz_svn Subversion Apache HTTP Authorization 402 Subversion 403 Versioned 403 Unversioned 404 Repository 405A.

9 Subversion Quick-Start 415 Installing 415 High-Speed 415B. Subversion for CVS 418 Revision Numbers Are Different 418 Directory 418 More Disconnected 419 Distinction Between Status and 420 Branches and 420 Metadata 421 Conflict 421 Binary Files and 421 Versioned 422 Converting a Repository from CVS to 422C. WebDAV and 423 What Is WebDAV?.. 424 Client 425 Standalone WebDAV 426 File-Explorer WebDAV 427 WebDAV Filesystem 428D. 436viiiList of Figures1. Subversion 's A typical client/server The problem to The lock-modify-unlock The copy-modify-merge The copy-modify-merge solution (continued).

10 Tree changes over The repository's Branches of Starting repository Repository with new The branching of one file's Files and directories in two Versioning time the third dimension!.. 235ixList of Repository access Common log Branching and merging Repository data store Comparison of Subversion server Common WebDAV 425xList of Merge-tracking gatekeeper start-commit hook (reporting outstanding transactions).. Mirror repository's pre-revprop-change hook Mirror repository's start-commit hook A sample svnserve launchd job A sample configuration for anonymous A sample configuration for authenticated A sample configuration for mixed authenticated/anonymous Disabling path checks Sample registration entries (.)