Version control with subversion : [the standard in open source version control

Version Control with Subversion......Page 3 Table of Contents......Page 4 Foreword......Page 12 Is Subversion the Right Tool?......Page 14 Subversion's Architecture......Page 15 What's New in Subversion......Page 17 How to Read This Book......Page 18 Organization of This Book......Page 19 Acknowledgments......Page 20 The Repository......Page 22 The problem of file sharing......Page 23 The lock-modify-unlock solution......Page 24 The copy-modify-merge solution......Page 25 Revisions......Page 28 Addressing the Repository......Page 29 Subversion Working Copies......Page 30 Fundamental working copy interactions......Page 31 Mixed-revision working copies......Page 33 Mixed revisions are normal......Page 34 Summary......Page 35 Help!......Page 36 Importing Files and Directories......Page 37 What's In a Name?......Page 38 Creating a Working Copy......Page 39 Basic Work Cycle......Page 40 Make Your Changes......Page 41 See an overview of your changes......Page 43 Examine the details of your local modifications......Page 45 Fix Your Mistakes......Page 46 Resolve Any Conflicts......Page 47 Resolving conflict differences interactively......Page 49 Postponing conflict resolution......Page 50 Merging conflicts by hand......Page 51 Punting: using svn revert......Page 53 Commit Your Changes......Page 54 Examining local changes......Page 55 Comparing repository revisions......Page 56 Generating a List of Historical Changes......Page 57 svn list......Page 59 Fetching Older Repository Snapshots......Page 60 Recovering from an Interruption......Page 61 An Example Tree Conflict......Page 62 Summary......Page 67 Revision Keywords......Page 68 Revision Dates......Page 69 Peg and Operative Revisions......Page 70 Properties......Page 74 Why Properties?......Page 75 Manipulating Properties......Page 76 Properties and the Subversion Workflow......Page 79 File Portability......Page 81 File Content Type......Page 82 End-of-Line Character Sequences......Page 83 Ignoring Unversioned Items......Page 84 Keyword Substitution......Page 88 Sparse Directories......Page 91 Locking......Page 95 Creating Locks......Page 97 Discovering Locks......Page 99 Breaking and Stealing Locks......Page 100 Externals Definitions......Page 102 Creating and Modifying Changelists......Page 108 Changelists As Operation Filters......Page 110 Requests and Responses......Page 112 Caching credentials......Page 113 Removing cached credentials......Page 114 Authentication wrap-up......Page 115 Summary......Page 116 Using Branches......Page 117 Creating a Branch......Page 119 Working with Your Branch......Page 120 Changesets......Page 123 Keeping a Branch in Sync......Page 124 Reintegrating a Branch......Page 126 Mergeinfo and Previews......Page 128 Undoing Changes......Page 129 Resurrecting Deleted Items......Page 130 Cherrypicking......Page 132 Merge Syntax: Full Disclosure......Page 134 Merges Without Mergeinfo......Page 135 More on Merge Conflicts......Page 136 Keeping a Reintegrated Branch Alive......Page 137 Merge-Sensitive Logs and Annotations......Page 138 Noticing or Ignoring Ancestry......Page 140 Blocking Merge-Unaware Clients......Page 141 The Final Word on Merge Tracking......Page 142 Traversing Branches......Page 143 Tags......Page 144 Creating a Complex Tag......Page 145 Repository Layout......Page 146 Data Lifetimes......Page 147 Feature Branches......Page 148 Vendor Branches......Page 149 General Vendor Branch Management Procedure......Page 150 svn_load_dirs.pl......Page 152 Summary......Page 153 The Subversion Repository, Defined......Page 155 Planning Your Repository Organization......Page 156 Deciding Where and How to Host Your Repository......Page 158 Choosing a Data Store......Page 159 Berkeley DB......Page 160 Creating and Configuring Your Repository......Page 161 Creating the Repository......Page 162 Implementing Repository Hooks......Page 163 svnadmin......Page 164 svnlook......Page 165 svndumpfilter......Page 166 fsfs-reshard.py......Page 167 Managing Disk Space......Page 168 Removing dead transactions......Page 169 Purging unused Berkeley DB logfiles......Page 170 Packing FSFS filesystems......Page 171 Berkeley DB Recovery......Page 172 Migrating Repository Data Elsewhere......Page 173 Filtering Repository History......Page 177 Repository Replication......Page 180 Repository Backup......Page 185 Managing Repository UUIDs......Page 187 Summary......Page 188 Overview......Page 189 svnserve over SSH......Page 190 Recommendations......Page 191 svnserve as daemon......Page 192 svnserve via inetd......Page 193 svnserve as a Windows service......Page 194 svnserve as a launchd job......Page 195 Built-in Authentication and Authorization......Page 196 Create a users file and realm......Page 197 Using svnserve with SASL......Page 198 Authenticating with SASL......Page 199 Tunneling over SSH......Page 200 Controlling the invoked command......Page 202 httpd, the Apache HTTP Server......Page 203 Basic Apache Configuration......Page 204 Authentication Options......Page 206 Basic authentication......Page 207 Digest authentication......Page 208 Blanket access control......Page 209 Per-directory access control......Page 210 Disabling path-based checks......Page 211 Subversion client SSL certificate management......Page 212 Client certificate challenge......Page 213 URL syntax......Page 214 Customizing the look......Page 215 Apache logging......Page 216 Write-through proxying......Page 217 Set up replication......Page 218 Other Apache features......Page 220 Path-Based Authorization......Page 221 High-level Logging......Page 225 Supporting Multiple Repository Access Methods......Page 227 Configuration Area Layout......Page 230 Configuration and the Windows Registry......Page 231 Servers......Page 232 Config......Page 235 Understanding Locales......Page 237 Subversion's Use of Locales......Page 238 Using External Differencing and Merge Tools......Page 239 External diff......Page 240 External diff3......Page 241 External merge......Page 243 Summary......Page 244 Layered Library Design......Page 245 Repository Layer......Page 246 Repository Access Layer......Page 249 Client Layer......Page 250 Pristine Copies and Property Files......Page 251 The Apache Portable Runtime Library......Page 252 Using Languages Other Than C and C++......Page 253 Code Samples......Page 254 Summary......Page 260 svn Options......Page 261 svn Subcommands......Page 266 svn add......Page 267 svn blame (praise, annotate, ann)......Page 269 svn cat......Page 271 svn changelist (cl)......Page 272 svn checkout (co)......Page 273 svn cleanup......Page 277 svn commit (ci)......Page 278 svn copy (cp)......Page 280 svn delete (del, remove, rm)......Page 283 svn diff (di)......Page 285 svn export......Page 289 svn help (h, ?)......Page 291 svn import......Page 292 svn info......Page 294 svn list (ls)......Page 297 svn lock......Page 299 svn log......Page 301 svn merge......Page 306 svn mergeinfo......Page 308 svn mkdir......Page 309 svn move (mv)......Page 310 svn propdel (pdel, pd)......Page 312 svn propedit (pedit, pe)......Page 313 svn propget (pget, pg)......Page 314 svn proplist (plist, pl)......Page 316 svn propset (pset, ps)......Page 318 svn resolve......Page 320 svn resolved......Page 322 svn revert......Page 323 svn status (stat, st)......Page 325 svn switch (sw)......Page 330 svn unlock......Page 332 svn update (up)......Page 333 svnadmin Options......Page 334 svnadmin Subcommands......Page 336 svnadmin crashtest......Page 337 svnadmin create......Page 338 svnadmin deltify......Page 339 svnadmin dump......Page 340 svnadmin help (h, ?)......Page 342 svnadmin hotcopy......Page 343 svnadmin list-dblogs......Page 344 svnadmin list-unused-dblogs......Page 345 svnadmin load......Page 346 svnadmin lslocks......Page 347 svnadmin lstxns......Page 348 svnadmin pack......Page 349 svnadmin recover......Page 350 svnadmin rmlocks......Page 352 svnadmin rmtxns......Page 353 svnadmin setlog......Page 354 svnadmin setrevprop......Page 355 svnadmin setuuid......Page 356 svnadmin upgrade......Page 357 svnlook Options......Page 358 svnlook Subcommands......Page 360 svnlook author......Page 361 svnlook cat......Page 362 svnlook changed......Page 363 svnlook date......Page 365 svnlook diff......Page 366 svnlook dirs-changed......Page 367 svnlook help (h, ?)......Page 368 svnlook history......Page 369 svnlook info......Page 370 svnlook lock......Page 371 svnlook log......Page 372 svnlook propget (pget, pg)......Page 373 svnlook proplist (plist, pl)......Page 374 svnlook tree......Page 375 svnlook uuid......Page 376 svnsync Options......Page 377 svnsync Subcommands......Page 378 svnsync copy-revprops......Page 379 svnsync help......Page 380 svnsync info......Page 381 svnsync initialize (init)......Page 382 svnserve—Custom Subversion Server......Page 383 svnserve Options......Page 384 svndumpfilter Subcommands......Page 385 svndumpfilter exclude......Page 386 svndumpfilter include......Page 387 svnversion—Subversion Working Copy Version Info......Page 388 svnversion......Page 389 mod_dav_svn—Subversion Apache HTTP Server Module......Page 390 mod_dav_svn Configuration Directives......Page 391 mod_authz_svn—Subversion Apache HTTP Authorization Module......Page 392 Versioned Properties......Page 393 Unversioned Properties......Page 394 Repository Hooks......Page 395 start-commit......Page 396 pre-commit......Page 397 post-commit......Page 398 pre-revprop-change......Page 399 post-revprop-change......Page 400 pre-lock......Page 401 post-lock......Page 402 pre-unlock......Page 403 post-unlock......Page 404 Installing Subversion......Page 405 High-Speed Tutorial......Page 406 Directory Versions......Page 409 Status......Page 410 Branches and Tags......Page 411 Versioned Modules......Page 412 Converting a Repository from CVS to Subversion......Page 413 What Is WebDAV?......Page 414 Autoversioning......Page 415 Client Interoperability......Page 416 cadaver, DAV Explorer......Page 417 Microsoft Web Folders......Page 418 Mac OS X......Page 419 Linux davfs2......Page 420 Appendix D. Copyright......Page 421 Index......Page 426 Written by members of the development team that maintains Subversion, this is the official guide and reference manual for the popular open source revision control technology. The new edition covers Subversion 1.5 with a complete introduction and guided tour of its capabilities, along with best practice recommendations.Version Control with Subversion is useful for people from a wide variety of backgrounds, from those with no previous version control experience to experienced system administrators. Subversion is the perfect tool to track individual changes when several people collaborate on documentation or, particularly, software development projects. As a more powerful and flexible successor to the CVS revision control system, Subversion makes life so much simpler, allowing each team member to work separately and then merge source code changes into a single repository that keeps a record of each separate version. Inside the updated edition Version Control with Subversion, you'll find:An introduction to Subversion and basic concepts behind version control A guided tour of the capabilities and structure of Subversion 1.5 Guidelines for installing and configuring Subversion to manage programming, documentation, or any other team-based project Detailed coverage of complex topics such as branching and repository administration Advanced features such as properties, externals, and access control A guide to best practices Complete Subversion reference and troubleshooting guide If you've never used version control, you'll find everything you need to get started. And if you're a seasoned CVS pro, this book will help you make a painless leap into Subversion.