没有合适的资源?快使用搜索试试~ 我知道了~
温馨提示
试读
457页
Table of Contents What Is Subversion? Is Subversion the Right Tool? Subversion's History Subversion's Architecture Subversion's Components What's New in Subversion Audience How to Read This Book Organization of This Book This Book Is Free Acknowledgments 1. Fundamental Concepts 2. Basic Usage 3. Advanced Topics 4. Branching and Merging 5. Repository Administration 6. Server Configuration 7. Customizing Your Subversion Experience 8. Embedding Subversion 9. Subversion Complete Reference
资源详情
资源评论
资源推荐
Version Control with Subversion
For Subversion 1.7
(Compiled from r6055)
Ben Collins-Sussman
Brian W. Fitzpatrick
C. Michael Pilato
Version Control with Subversion: For Subversion 1.7: (Compiled from r6055)
by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Michael Pilato
Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ben Collins-Sussman, Brian W. Fitzpatrick, C. Michael
Pilato
This work is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/2.0/ or send a
letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
iii
Table of Contents
Foreword .............................................................................................................................................................. xi
Preface ............................................................................................................................................................... xiii
What Is Subversion? .................................................................................................................................... xiii
Is Subversion the Right Tool? ............................................................................................................... xiii
Subversion's History ............................................................................................................................. xiv
Subversion's Architecture ....................................................................................................................... xv
Subversion's Components ..................................................................................................................... xvii
What's New in Subversion ................................................................................................................... xvii
Audience .................................................................................................................................................. xviii
How to Read This Book ............................................................................................................................... xix
Organization of This Book ............................................................................................................................. xx
This Book Is Free ........................................................................................................................................ xxi
Acknowledgments ........................................................................................................................................ xxi
1. Fundamental Concepts ......................................................................................................................................... 1
Version Control Basics .................................................................................................................................... 1
The Repository ...................................................................................................................................... 1
The Working Copy ................................................................................................................................. 2
Versioning Models ................................................................................................................................. 2
Version Control the Subversion Way ................................................................................................................. 7
Subversion Repositories ........................................................................................................................... 7
Revisions .............................................................................................................................................. 7
Addressing the Repository ....................................................................................................................... 8
Subversion Working Copies ..................................................................................................................... 9
Summary ..................................................................................................................................................... 14
2. Basic Usage ..................................................................................................................................................... 15
Help! .......................................................................................................................................................... 15
Getting Data into Your Repository .................................................................................................................. 16
Importing Files and Directories ............................................................................................................... 16
Recommended Repository Layout ........................................................................................................... 17
What's In a Name? ............................................................................................................................... 17
Creating a Working Copy .............................................................................................................................. 18
Basic Work Cycle ......................................................................................................................................... 19
Update Your Working Copy ................................................................................................................... 20
Make Your Changes .............................................................................................................................. 20
Review Your Changes ........................................................................................................................... 21
Fix Your Mistakes ................................................................................................................................ 25
Resolve Any Conflicts ........................................................................................................................... 26
Commit Your Changes .......................................................................................................................... 32
Examining History ........................................................................................................................................ 33
Examining the Details of Historical Changes ............................................................................................. 34
Generating a List of Historical Changes ................................................................................................... 35
Browsing the Repository ........................................................................................................................ 37
Fetching Older Repository Snapshots ....................................................................................................... 39
Sometimes You Just Need to Clean Up ............................................................................................................ 40
Disposing of a Working Copy ................................................................................................................ 40
Recovering from an Interruption ............................................................................................................. 40
Dealing with Structural Conflicts ..................................................................................................................... 41
An Example Tree Conflict ..................................................................................................................... 42
Summary ..................................................................................................................................................... 46
3. Advanced Topics .............................................................................................................................................. 47
Revision Specifiers ....................................................................................................................................... 47
Version Control with Subversion
iv
Revision Keywords ............................................................................................................................... 47
Revision Dates ..................................................................................................................................... 48
Peg and Operative Revisions .......................................................................................................................... 49
Properties .................................................................................................................................................... 53
Why Properties? ................................................................................................................................... 54
Manipulating Properties ......................................................................................................................... 55
Properties and the Subversion Workflow .................................................................................................. 58
Automatic Property Setting ..................................................................................................................... 60
File Portability ............................................................................................................................................. 60
File Content Type ................................................................................................................................. 61
File Executability .................................................................................................................................. 62
End-of-Line Character Sequences ............................................................................................................ 62
Ignoring Unversioned Items ............................................................................................................................ 63
Keyword Substitution .................................................................................................................................... 66
Sparse Directories ......................................................................................................................................... 70
Locking ....................................................................................................................................................... 74
Creating Locks ..................................................................................................................................... 75
Discovering Locks ................................................................................................................................ 77
Breaking and Stealing Locks .................................................................................................................. 78
Lock Communication ............................................................................................................................ 80
Externals Definitions ..................................................................................................................................... 81
Changelists .................................................................................................................................................. 86
Creating and Modifying Changelists ........................................................................................................ 87
Changelists As Operation Filters ............................................................................................................. 89
Changelist Limitations ........................................................................................................................... 90
Network Model ............................................................................................................................................ 90
Requests and Responses ......................................................................................................................... 91
Client Credentials ................................................................................................................................. 91
Summary ..................................................................................................................................................... 94
4. Branching and Merging ...................................................................................................................................... 95
What's a Branch? .......................................................................................................................................... 95
Using Branches ............................................................................................................................................ 95
Creating a Branch ................................................................................................................................. 97
Working with Your Branch .................................................................................................................... 98
The Key Concepts Behind Branching ..................................................................................................... 101
Basic Merging ............................................................................................................................................ 101
Changesets ......................................................................................................................................... 101
Keeping a Branch in Sync .................................................................................................................... 102
Subtree Merges and Subtree Mergeinfo .................................................................................................. 105
Reintegrating a Branch ......................................................................................................................... 107
Mergeinfo and Previews ....................................................................................................................... 109
Undoing Changes ................................................................................................................................ 113
Resurrecting Deleted Items ................................................................................................................... 114
Advanced Merging ...................................................................................................................................... 115
Cherrypicking ..................................................................................................................................... 115
Merge Syntax: Full Disclosure .............................................................................................................. 117
Merges Without Mergeinfo ................................................................................................................... 118
More on Merge Conflicts ..................................................................................................................... 119
Blocking Changes ............................................................................................................................... 121
Keeping a Reintegrated Branch Alive ..................................................................................................... 122
Merge-Sensitive Logs and Annotations ................................................................................................... 123
Noticing or Ignoring Ancestry ............................................................................................................... 125
Merges and Moves .............................................................................................................................. 126
Preventing Naïve Clients from Committing Merges .................................................................................. 126
Version Control with Subversion
v
The Final Word on Merge Tracking ....................................................................................................... 127
Traversing Branches .................................................................................................................................... 128
Tags .......................................................................................................................................................... 129
Creating a Simple Tag ......................................................................................................................... 130
Creating a Complex Tag ...................................................................................................................... 130
Branch Maintenance .................................................................................................................................... 131
Repository Layout ............................................................................................................................... 131
Data Lifetimes .................................................................................................................................... 132
Common Branching Patterns ......................................................................................................................... 132
Release Branches ................................................................................................................................ 133
Feature Branches ................................................................................................................................. 133
Vendor Branches ......................................................................................................................................... 134
General Vendor Branch Management Procedure ....................................................................................... 135
svn_load_dirs.pl .................................................................................................................................. 136
To Branch or Not to Branch? ........................................................................................................................ 137
Summary ................................................................................................................................................... 138
5. Repository Administration ................................................................................................................................. 140
The Subversion Repository, Defined .............................................................................................................. 140
Strategies for Repository Deployment ............................................................................................................. 141
Planning Your Repository Organization .................................................................................................. 141
Deciding Where and How to Host Your Repository .................................................................................. 143
Choosing a Data Store ......................................................................................................................... 144
Creating and Configuring Your Repository ...................................................................................................... 146
Creating the Repository ........................................................................................................................ 147
Implementing Repository Hooks ............................................................................................................ 147
Berkeley DB Configuration .................................................................................................................. 149
FSFS Configuration ............................................................................................................................. 149
Repository Maintenance ............................................................................................................................... 149
An Administrator's Toolkit ................................................................................................................... 149
Commit Log Message Correction ........................................................................................................... 153
Managing Disk Space .......................................................................................................................... 153
Berkeley DB Recovery ........................................................................................................................ 157
Migrating Repository Data Elsewhere ..................................................................................................... 158
Filtering Repository History .................................................................................................................. 162
Repository Replication ......................................................................................................................... 165
Repository Backup .............................................................................................................................. 171
Managing Repository UUIDs ................................................................................................................ 173
Moving and Removing Repositories ............................................................................................................... 174
Summary ................................................................................................................................................... 174
6. Server Configuration ........................................................................................................................................ 175
Overview ................................................................................................................................................... 175
Choosing a Server Configuration ................................................................................................................... 176
The svnserve Server ............................................................................................................................ 176
svnserve over SSH .............................................................................................................................. 176
The Apache HTTP Server .................................................................................................................... 177
Recommendations ............................................................................................................................... 177
svnserve, a Custom Server ............................................................................................................................ 178
Invoking the Server ............................................................................................................................. 178
Built-in Authentication and Authorization ............................................................................................... 182
Using svnserve with SASL .................................................................................................................. 184
Tunneling over SSH ............................................................................................................................ 186
SSH Configuration Tricks ..................................................................................................................... 187
httpd, the Apache HTTP Server ..................................................................................................................... 188
Prerequisites ....................................................................................................................................... 189
剩余456页未读,继续阅读
dyh200896
- 粉丝: 5
- 资源: 24
上传资源 快速赚钱
- 我的内容管理 展开
- 我的资源 快来上传第一个资源
- 我的收益 登录查看自己的收益
- 我的积分 登录查看自己的积分
- 我的C币 登录后查看C币余额
- 我的收藏
- 我的下载
- 下载帮助
安全验证
文档复制为VIP权益,开通VIP直接复制
信息提交成功
评论0