Peg and Operative Revisions ...................................................................................................................48
Properties ............................................................................................................................................52
Why Properties? ........................................................................................................................... 53
Manipulating Properties ................................................................................................................. 54
Properties and the Subversion Workflow ...........................................................................................57
Automatic Property Setting ............................................................................................................. 58
File Portability ...................................................................................................................................... 58
File Content Type .........................................................................................................................59
File Executability .......................................................................................................................... 60
End-of-Line Character Sequences ....................................................................................................60
Ignoring Unversioned Items .................................................................................................................... 61
Keyword Substitution ............................................................................................................................65
Sparse Directories .................................................................................................................................68
Locking ...............................................................................................................................................72
Creating Locks .............................................................................................................................73
Discovering Locks ........................................................................................................................76
Breaking and Stealing Locks ...........................................................................................................76
Lock Communication .....................................................................................................................78
Externals Definitions ............................................................................................................................. 79
Changelists ..........................................................................................................................................85
Creating and Modifying Changelists .................................................................................................85
Changelists As Operation Filters ......................................................................................................87
Changelist Limitations ...................................................................................................................89
Network Model ....................................................................................................................................89
Requests and Responses ................................................................................................................. 89
Client Credentials ..........................................................................................................................90
Summary ............................................................................................................................................. 92
4. Branching and Merging .............................................................................................................................. 94
What's a Branch? ..................................................................................................................................94
Using Branches ....................................................................................................................................94
Creating a Branch .........................................................................................................................96
Working with Your Branch .............................................................................................................97
The Key Concepts Behind Branching .............................................................................................. 100
Basic Merging .................................................................................................................................... 100
Changesets ................................................................................................................................ 100
Keeping a Branch in Sync ............................................................................................................. 101
Reintegrating a Branch ................................................................................................................. 103
Mergeinfo and Previews ............................................................................................................... 105
Undoing Changes ........................................................................................................................ 106
Resurrecting Deleted Items ........................................................................................................... 107
Advanced Merging .............................................................................................................................. 109
Cherrypicking ............................................................................................................................ 109
Merge Syntax: Full Disclosure ....................................................................................................... 110
Merges Without Mergeinfo ........................................................................................................... 111
More on Merge Conflicts .............................................................................................................. 113
Blocking Changes ....................................................................................................................... 114
Keeping a Reintegrated Branch Alive ............................................................................................. 114
Merge-Sensitive Logs and Annotations ........................................................................................... 115
Noticing or Ignoring Ancestry ....................................................................................................... 117
Merges and Moves ...................................................................................................................... 118
Blocking Merge-Unaware Clients .................................................................................................. 118
The Final Word on Merge Tracking ................................................................................................ 119
Traversing Branches ............................................................................................................................ 120
Tags ................................................................................................................................................. 121
Creating a Simple Tag .................................................................................................................. 121
Creating a Complex Tag ............................................................................................................... 122
Branch Maintenance ............................................................................................................................ 123
Repository Layout ....................................................................................................................... 123
Draft Version Control with Subversion [DRAFT] Draft
v
评论0