Subversion 1.5版本控制指南

需积分: 9 43 浏览量更新于2024-07-27 收藏 1.59MB PDF 举报

"SVN manual" Subversion（简称SVN）是一种版本控制系统，它在开源软件领域中被广泛使用，尤其是在CVS（Concurrent Versions System）成为过去的选择之后。本手册详细介绍了Subversion 1.5版本，由Ben Collins-Sussman、Brian W. Fitzpatrick和C. Michael Pilato三位作者编撰。此手册的目的是为了帮助用户理解和掌握Subversion的基本操作和高级特性。在Subversion中，版本控制是关键，它允许开发者跟踪和管理项目中的文件和目录的更改历史。这使得多人协作变得容易，因为每个开发者的修改都能被追踪并合并到主版本中，减少了代码冲突的可能性。Subversion的核心设计理念是并发版本ing，意味着多个用户可以同时编辑同一份文件，而系统会自动处理合并这些更改的过程。手册的组织结构包括： 1. 前言和序言部分，作者们阐述了编写本书的动机和目标，以及Subversion的发展历程和架构。 2. 对读者群体的说明，指出本书适合对版本控制有需求的个人、团队或组织，无论他们是初学者还是经验丰富的用户。 3. 如何阅读本书的指导，帮助读者更有效地学习Subversion的知识。 4. 书中使用的约定，例如特殊符号和术语的定义，以统一读者的理解。 5. 描述了本书的章节分布，包括Subversion的基础概念、安装与配置、日常使用、高级功能和最佳实践。 6. 版权信息，指出本书遵循Creative Commons Attribution License，鼓励分享和再利用。 7. 致谢部分，对贡献者和支持者表示感谢。 Subversion的新特性可能包括改进的冲突解决机制、增强的安全性、性能优化以及对不同操作系统和平台更好的支持。手册的第1章“Fundamental Concepts”将深入介绍Subversion的基本概念，如工作副本、仓库、提交、分支和标签等。通过学习这个手册，读者将能够设置和管理自己的Subversion服务器，执行版本控制操作，如检出、更新、提交和合并，并解决可能出现的问题。此外，还会了解到如何使用Subversion进行版本回溯、版本比较以及如何有效地协作开发项目。

The following typographic conventions are used in this book:

Constant width

Used for literal user input, command output, and command-line options

Italic

Used for program and Subversion tool subcommand names, file and directory names,

and new terms

Constant width italic

Used for replaceable items in code and text

Also, we sprinkled especially helpful or important bits of information throughout the book (in

contextually relevant locations), set off visually so they're easy to find. Look for the follow-

ing icons as you read:

This icon designates a special point of interest.

This icon designates a helpful tip or recommended best practice.

This icon designates a warning. Pay close attention to these to avoid running

into problems.

Organization of This Book

The chapters that follow and their contents are listed here:

Chapter 1, Fundamental Concepts

Explains the basics of version control and different versioning models, along with Sub-

version's repository, working copies, and revisions.

Chapter 2, Basic Usage

Walks you through a day in the life of a Subversion user. It demonstrates how to use a

Subversion client to obtain, modify, and commit data.

Chapter 3, Advanced Topics

Covers more complex features that regular users will eventually come into contact

with, such as versioned metadata, file locking, and peg revisions.

Chapter 4, Branching and Merging

Discusses branches, merges, and tagging, including best practices for branching and

merging, common use cases, how to undo changes, and how to easily swing from one

branch to the next.

Chapter 5, Repository Administration

Describes the basics of the Subversion repository, how to create, configure, and main-

tain a repository, and the tools you can use to do all of this.

Chapter 6, Server Configuration

Explains how to configure your Subversion server and offers different ways to access

your repository: HTTP, the svn protocol, and local disk access. It also covers the de-

tails of authentication, authorization and anonymous access.

Preface

xvi

Chapter 7, Customizing Your Subversion Experience

Explores the Subversion client configuration files, the handling of internationalized text,

and how to make external tools cooperate with Subversion.

Chapter 8, Embedding Subversion

Describes the internals of Subversion, the Subversion filesystem, and the working copy

administrative areas from a programmer's point of view. It also demonstrates how to

use the public APIs to write a program that uses Subversion.

Chapter 9, Subversion Complete Reference

Explains in great detail every subcommand of svn, svnadmin, and svnlook with

plenty of examples for the whole family!

Appendix A, Subversion Quick-Start Guide

For the impatient, a whirlwind explanation of how to install Subversion and start using it

immediately. You have been warned.

Appendix B, Subversion for CVS Users

Covers the similarities and differences between Subversion and CVS, with numerous

suggestions on how to break all the bad habits you picked up from years of using CVS.

Included are descriptions of Subversion revision numbers, versioned directories, offline

operations, update versus status, branches, tags, metadata, conflict resolution, and

authentication.

Appendix C, WebDAV and Autoversioning

Describes the details of WebDAV and DeltaV and how you can configure your Subver-

sion repository to be mounted read/write as a DAV share.

Appendix D, Copyright

A copy of the Creative Commons Attribution License, under which this book is li-

censed.

This Book Is Free

This book started out as bits of documentation written by Subversion project developers,

which were then coalesced into a single work and rewritten. As such, it has always been

under a free license (see Appendix D, Copyright). In fact, the book was written in the public

eye, originally as part of the Subversion project itself. This means two things:

• You will always find the latest version of this book in the book's own Subversion reposit-

ory.

• You can make changes to this book and redistribute it however you wish—it's under a

free license. Your only obligation is to maintain proper attribution to the original authors.

Of course, we'd much rather you send feedback and patches to the Subversion de-

veloper community, instead of distributing your private version of this book.

The online home of this book's development and most of the volunteer-driven translation

efforts regarding it is http://svnbook.red-bean.com. There you can find links to the latest re-

leases and tagged versions of the book in various formats, as well as instructions for ac-

cessing the book's Subversion repository (where its DocBook XML source code lives).

Feedback is welcomed—encouraged, even. Please submit all comments, complaints, and

patches against the book sources to <svnbook-dev@red-bean.com>.

Acknowledgments

This book would not be possible (nor very useful) if Subversion did not exist. For that, the

Preface

xvii

Oh, and thanks, Karl, for being too overworked to write this book yourself.

authors would like to thank Brian Behlendorf and CollabNet for the vision to fund such a

risky and ambitious new open source project; Jim Blandy for the original Subversion name

and design—we love you, Jim; and Karl Fogel for being such a good friend and a great

community leader, in that order.

Thanks to O'Reilly and our various editors: Chuck Toporek, Linda Mui, Tatiana Apandi,

Mary Brady, and Mary Treseler. Their patience and support has been tremendous.

Finally, we thank the countless people who contributed to this book with informal reviews,

suggestions, and patches. While this is undoubtedly not a complete list, this book would be

incomplete and incorrect without their help: Bhuvaneswaran A, David Alber, C. Scott

Ananian, David Anderson, Ariel Arjona, Seth Arnold, Jani Averbach, Charles Bailey, Ryan

Barrett, Francois Beausoleil, Brian R. Becker, Yves Bergeron, Karl Berry, Jennifer Bevan,

Matt Blais, Jim Blandy, Phil Bordelon, Sietse Brouwer, Tom Brown, Zack Brown, Martin

Buchholz, Paul Burba, Sean Callan-Hinsvark, Branko Cibej, Archie Cobbs, Jason Cohen,

Ryan Cresawn, John R. Daily, Peter Davis, Olivier Davy, Robert P. J. Day, Mo DeJong,

Brian Denny, Joe Drew, Markus Dreyer, Nick Duffek, Boris Dusek, Ben Elliston, Justin Er-

enkrantz, Jens M. Felderhoff, Kyle Ferrio, Shlomi Fish, Julian Foad, Chris Foote, Martin

Furter, Vlad Georgescu, Peter Gervai, Dave Gilbert, Eric Gillespie, David Glasser, Marcel

Gosselin, Lieven Govaerts, Steve Greenland, Matthew Gregan, Tom Gregory, Maverick

Grey, Art Haas, Mark E. Hamilton, Eric Hanchrow, Liam Healy, Malte Helmert, Michael

Henderson, Øyvind A. Holm, Greg Hudson, Alexis Huxley, Auke Jilderda, Toby Johnson,

Jens B. Jorgensen, Tez Kamihira, David Kimdon, Mark Benedetto King, Robert Kleemann,

Erik Kline, Josh Knowles, Andreas J. Koenig, Axel Kollmorgen, Nuutti Kotivuori, Kalin

Kozhuharov, Matt Kraai, Regis Kuckaertz, Stefan Kueng, Steve Kunkee, Scott Lamb, Wes-

ley J. Landaker, Benjamin Landsteiner, Vincent Lefevre, Morten Ludvigsen, Dennis Lund-

berg, Paul Lussier, Bruce A. Mah, Jonathon Mah, Karl Heinz Marbaise, Philip Martin, Feli-

ciano Matias, Neil Mayhew, Patrick Mayweg, Gareth McCaughan, Craig McElroy, Simon

McKenna, Christophe Meresse, Jonathan Metillon, Jean-Francois Michaud, Jon Middleton,

Robert Moerland, Marcel Molina Jr., Tim Moloney, Alexander Mueller, Tabish Mustufa,

Christopher Ness, Roman Neuhauser, Mats Nilsson, Greg Noel, Joe Orton, Eric Paire, Di-

mitri Papadopoulos-Orfanos, Jerry Peek, Chris Pepper, Amy Lyn Pilato, Kevin Pilch-Bis-

son, Hans Polak, Dmitriy Popkov, Michael Price, Mark Proctor, Steffen Prohaska, Daniel

Rall, Srinivasa Ramanujan, Jack Repenning, Tobias Ringstrom, Jason Robbins, Garrett

Rooney, Joel Rosdahl, Christian Sauer, Ryan Schmidt, Jochem Schulenklopper, Jens

Seidel, Daniel Shahaf, Larry Shatzer, Danil Shopyrin, Erik Sjoelund, Joey Smith, W.

Snyder, Stefan Sperling, Robert Spier, M. S. Sriram, Russell Steicke, David Steinbrunner,

Sander Striker, David Summers, Johan Sundstroem, Ed Swierk, John Szakmeister, Arfre-

ver Frehtes Taifersar Arahesis, Robert Tasarz, Michael W. Thelen, Mason Thomas, Erik

van der Kolk, Joshua Varner, Eric Wadsworth, Chris Wagner, Colin Watson, Alex Waugh,

Chad Whitacre, Andy Whitcroft, Josef Wolf, Luke Worth, Hyrum Wright, Blair Zajac, Florian

Zumbiehl, and the entire Subversion community.

From Ben Collins-Sussman

Thanks to my wife Frances, who, for many months, got to hear “But honey, I'm still working

on the book,” rather than the usual “But honey, I'm still doing email.” I don't know where

she gets all that patience! She's my perfect counterbalance.

Thanks to my extended family and friends for their sincere encouragement, despite having

no actual interest in the subject. (You know, the ones who say, “Ooh, you wrote a book?”

and then when you tell them it's a computer book, sort of glaze over.)

Thanks to all my close friends, who make me a rich, rich man. Don't look at me that

way—you know who you are.

Thanks to my parents for the perfect low-level formatting and being unbelievable role mod-

els. Thanks to my kids for the opportunity to pass that on.

Preface

xviii

From Brian W. Fitzpatrick

Huge thanks to my wife Marie for being incredibly understanding, supportive, and most of

all, patient. Thank you to my brother Eric who first introduced me to Unix programming way

back when. Thanks to my Mom and Grandmother for all their support, not to mention en-

during a Christmas holiday where I came home and promptly buried my head in my laptop

to work on the book.

To Mike and Ben: it was a pleasure working with you on the book. Heck, it's a pleasure

working with you at work!

To everyone in the Subversion community and the Apache Software Foundation, thanks

for having me. Not a day goes by where I don't learn something from at least one of you.

Lastly, thanks to my grandfather, who always told me that “freedom equals responsibility.” I

couldn't agree more.

From C. Michael Pilato

Special thanks to Amy, my best friend and wife of more than ten incredible years, for her

love and patient support, for putting up with the late nights, and for graciously enduring the

version control processes I've imposed on her. Don't worry, sweetheart—you'll be a Tor-

toiseSVN wizard in no time!

Gavin, you're able to read half of the words in this book yourself now; sadly, it's the other

half that provide the key concepts. And sorry, Aidan — I couldn't find a way to work Disney/

Pixar characters into the text. But Daddy loves you both, and can't wait to teach you about

programming.

Mom and Dad, thanks for your constant support and enthusiasm. Mom- and Dad-in-law,

thanks for all of the same plus your fabulous daughter.

Hats off to Shep Kendall, through whom the world of computers was first opened to me;

Ben Collins-Sussman, my tour guide through the open source world; Karl Fogel, you are

my .emacs; Greg Stein, for oozing practical programming know-how; and Brian

Fitzpatrick, for sharing this writing experience with me. To the many folks from whom I am

constantly picking up new knowledge—keep dropping it!

Finally, to the One who perfectly demonstrates creative excellence—thank You.

What Is Subversion?

Subversion is a free/open source version control system. That is, Subversion manages

files and directories, and the changes made to them, over time. This allows you to recover

older versions of your data or examine the history of how your data changed. In this re-

gard, many people think of a version control system as a sort of “time machine.”

Subversion can operate across networks, which allows it to be used by people on different

computers. At some level, the ability for various people to modify and manage the same

set of data from their respective locations fosters collaboration. Progress can occur more

quickly without a single conduit through which all modifications must occur. And because

the work is versioned, you need not fear that quality is the trade-off for losing that con-

duit—if some incorrect change is made to the data, just undo that change.

Some version control systems are also software configuration management (SCM) sys-

tems. These systems are specifically tailored to manage trees of source code and have

many features that are specific to software development—such as natively understanding

programming languages, or supplying tools for building software. Subversion, however, is

not one of these systems. It is a general system that can be used to manage any collection

of files. For you, those files might be source code—for others, anything from grocery shop-

Preface

xix

Or as a friend puts it, “swatting a fly with a Buick.”

ping lists to digital video mixdowns and beyond.

Is Subversion the Right Tool?

If you're a user or system administrator pondering the use of Subversion, the first question

you should ask yourself is: "Is this the right tool for the job?" Subversion is a fantastic ham-

mer, but be careful not to view every problem as a nail.

If you need to archive old versions of files and directories, possibly resurrect them, or ex-

amine logs of how they've changed over time, then Subversion is exactly the right tool for

you. If you need to collaborate with people on documents (usually over a network) and

keep track of who made which changes, then Subversion is also appropriate. This is why

Subversion is so often used in software development environments— working on a devel-

opment team is an inherently social activity, and Subversion makes it easy to collaborate

with other programmers. Of course, there's a cost to using Subversion as well: administrat-

ive overhead. You'll need to manage a data repository to store the information and all its

history, and be diligent about backing it up. When working with the data on a daily basis,

you won't be able to copy, move, rename, or delete files the way you usually do. Instead,

you'll have to do all of those things through Subversion.

Assuming you're fine with the extra workflow, you should still make sure you're not using

Subversion to solve a problem that other tools solve better. For example, because Subver-

sion replicates data to all the collaborators involved, a common misuse is to treat it as a

generic distribution system. People will sometimes use Subversion to distribute huge col-

lections of photos, digital music, or software packages. The problem is that this sort of data

usually isn't changing at all. The collection itself grows over time, but the individual files

within the collection aren't being changed. In this case, using Subversion is “overkill.”

There are simpler tools that efficiently replicate data without the overhead of tracking

changes, such as rsync or unison.

Subversion's History

In early 2000, CollabNet, Inc. (http://www.collab.net) began seeking developers to write a

replacement for CVS. CollabNet offers a collaboration software suite called CollabNet En-

terprise Edition (CEE), of which one component is version control. Although CEE used

CVS as its initial version control system, CVS's limitations were obvious from the begin-

ning, and CollabNet knew it would eventually have to find something better. Unfortunately,

CVS had become the de facto standard in the open source world largely because there

wasn't anything better, at least not under a free license. So CollabNet determined to write a

new version control system from scratch, retaining the basic ideas of CVS, but without the

bugs and misfeatures.

In February 2000, they contacted Karl Fogel, the author of Open Source Development with

CVS (Coriolis, 1999), and asked if he'd like to work on this new project. Coincidentally, at

the time Karl was already discussing a design for a new version control system with his

friend Jim Blandy. In 1995, the two had started Cyclic Software, a company providing CVS

support contracts, and although they later sold the business, they still used CVS every day

at their jobs. Their frustration with CVS had led Jim to think carefully about better ways to

manage versioned data, and he'd already come up with not only the name “Subversion,”

but also the basic design of the Subversion data store. When CollabNet called, Karl imme-

diately agreed to work on the project, and Jim got his employer, Red Hat Software, to es-

sentially donate him to the project for an indefinite period of time. CollabNet hired Karl and

Ben Collins-Sussman, and detailed design work began in May 2000. With the help of some

well-placed prods from Brian Behlendorf and Jason Robbins of CollabNet, and from Greg

Stein (at the time an independent developer active in the WebDAV/DeltaV specification

process), Subversion quickly attracted a community of active developers. It turned out that

many people had encountered the same frustrating experiences with CVS and welcomed

the chance to finally do something about it.

Preface

剩余406页未读，继续阅读

woskin

粉丝: 0
资源: 2

Subversion 1.5版本控制指南

PostGIS 2.0.0 SVN 安装与使用指南

Windows环境下安装SVN+Apache+Trac指南

SVN与Trac安装指南中文版(PDF)

PostGIS 2.0.0SVN Manual

SVN manual guide.pdf

manual-svn:对我来说

Zend Framework Manual 官方svn导出编译版chm.rar

SVN Document

svn使用相关

svn中文手册

最新资源