w orei02 - Version Control with Subversion, Książki IT

[ Pobierz całość w formacie PDF ]
//-->Version Control with SubversionFor Subversion 1.7(Compiled from r4671)Ben Collins-SussmanBrian W. FitzpatrickC. Michael PilatoVersion Control with Subversion: For Subversion 1.7: (Compiled from r4671)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, visithttp://creativecommons.org/licenses/by/2.0/or send aletter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.Table of ContentsForeword .....................................................................................................................................................xiiPreface ....................................................................................................................................................... xivWhat Is Subversion? ............................................................................................................................. xivIs Subversion the Right Tool? ......................................................................................................... xivSubversion's History ...................................................................................................................... xvSubversion's Architecture .............................................................................................................. xviSubversion's Components ............................................................................................................ xviiiWhat's New in Subversion ........................................................................................................... xviiiAudience ............................................................................................................................................ xixHow to Read This Book ........................................................................................................................ xixOrganization of This Book ...................................................................................................................... xxThis Book Is Free ................................................................................................................................. xxiAcknowledgments ............................................................................................................................... xxii1. Fundamental Concepts ................................................................................................................................. 1Version Control Basics ............................................................................................................................ 1The Repository .............................................................................................................................. 1The Working Copy ......................................................................................................................... 2Versioning Models ......................................................................................................................... 2Version Control the Subversion Way ......................................................................................................... 7Subversion Repositories .................................................................................................................. 7Revisions ...................................................................................................................................... 7Addressing the Repository ............................................................................................................... 8Subversion Working Copies ............................................................................................................. 9Summary ............................................................................................................................................. 142. Basic Usage .............................................................................................................................................. 15Help! .................................................................................................................................................. 15Getting Data into Your Repository ........................................................................................................... 16Importing Files and Directories ........................................................................................................ 16Recommended Repository Layout .................................................................................................... 17What's In a Name? ........................................................................................................................ 17Creating a Working Copy ....................................................................................................................... 18Basic Work Cycle ................................................................................................................................. 19Update Your Working Copy ............................................................................................................ 20Make Your Changes ...................................................................................................................... 20Review Your Changes ................................................................................................................... 22Fix Your Mistakes ......................................................................................................................... 25Resolve Any Conflicts ................................................................................................................... 26Commit Your Changes ................................................................................................................... 33Examining History ................................................................................................................................ 34Examining the Details of Historical Changes ...................................................................................... 34Generating a List of Historical Changes ............................................................................................. 36Browsing the Repository ................................................................................................................ 38Fetching Older Repository Snapshots ................................................................................................ 40Sometimes You Just Need to Clean Up ..................................................................................................... 41Disposing of a Working Copy ......................................................................................................... 42Recovering from an Interruption ...................................................................................................... 42Dealing with Structural Conflicts ............................................................................................................. 42An Example Tree Conflict .............................................................................................................. 43Summary ............................................................................................................................................. 483. Advanced Topics ....................................................................................................................................... 49Revision Specifiers ................................................................................................................................ 49Revision Keywords ....................................................................................................................... 49Revision Dates ............................................................................................................................. 50ivVersion Control with SubversionPeg and Operative Revisions ................................................................................................................... 51Properties ............................................................................................................................................ 55Why Properties? ........................................................................................................................... 56Manipulating Properties ................................................................................................................. 57Properties and the Subversion Workflow ........................................................................................... 60Automatic Property Setting ............................................................................................................. 62File Portability ...................................................................................................................................... 63File Content Type ......................................................................................................................... 63File Executability .......................................................................................................................... 64End-of-Line Character Sequences .................................................................................................... 65Ignoring Unversioned Items .................................................................................................................... 66Keyword Substitution ............................................................................................................................ 69Sparse Directories ................................................................................................................................. 72Locking ............................................................................................................................................... 77Creating Locks ............................................................................................................................. 78Discovering Locks ........................................................................................................................ 80Breaking and Stealing Locks ........................................................................................................... 81Lock Communication ..................................................................................................................... 83Externals Definitions ............................................................................................................................. 84Changelists .......................................................................................................................................... 90Creating and Modifying Changelists ................................................................................................. 90Changelists As Operation Filters ...................................................................................................... 92Changelist Limitations ................................................................................................................... 94Network Model .................................................................................................................................... 94Requests and Responses ................................................................................................................. 94Client Credentials .......................................................................................................................... 95Summary ............................................................................................................................................. 974. Branching and Merging .............................................................................................................................. 99What's a Branch? .................................................................................................................................. 99Using Branches .................................................................................................................................... 99Creating a Branch ....................................................................................................................... 101Working with Your Branch ........................................................................................................... 102The Key Concepts Behind Branching .............................................................................................. 105Basic Merging .................................................................................................................................... 105Changesets ................................................................................................................................ 105Keeping a Branch in Sync ............................................................................................................. 106Reintegrating a Branch ................................................................................................................. 111Mergeinfo and Previews ............................................................................................................... 113Undoing Changes ........................................................................................................................ 116Resurrecting Deleted Items ........................................................................................................... 117Advanced Merging .............................................................................................................................. 119Cherrypicking ............................................................................................................................ 119Merge Syntax: Full Disclosure ....................................................................................................... 121Merges Without Mergeinfo ........................................................................................................... 122More on Merge Conflicts .............................................................................................................. 123Blocking Changes ....................................................................................................................... 125Keeping a Reintegrated Branch Alive ............................................................................................. 126Merge-Sensitive Logs and Annotations ........................................................................................... 127Noticing or Ignoring Ancestry ....................................................................................................... 129Merges and Moves ...................................................................................................................... 130Blocking Merge-Unaware Clients .................................................................................................. 130The Final Word on Merge Tracking ................................................................................................ 131Traversing Branches ............................................................................................................................ 132Tags ................................................................................................................................................. 134Creating a Simple Tag .................................................................................................................. 134Creating a Complex Tag ............................................................................................................... 134Branch Maintenance ............................................................................................................................ 135Repository Layout ....................................................................................................................... 135v [ Pobierz całość w formacie PDF ]