Subversion 1.3：版本控制系统指南

需积分: 9 92 浏览量更新于2024-07-29 收藏 1.28MB PDF 举报

"Version Control with Subversion For Subversion 1.3 是一本面向熟悉计算机并希望使用Subversion管理数据的用户的书籍。Subversion在多种操作系统上运行，主要用户界面是命令行工具（svn）。本书中的示例假设读者使用的是类似Unix的操作系统，并对Unix和命令行接口感到舒适。这本书由Ben Collins-Sussman、Brian W. Fitzpatrick和C. Michael Pilato撰写，版权自2002年至2006年。" Subversion是一种版本控制系统，它允许用户跟踪和管理文件和目录的更改。在Subversion 1.3这个版本中，本书旨在教育读者如何有效地使用该工具。Subversion的历史始于对其他版本控制系统的不满，其目标是提供一个更现代、更灵活且易于使用的解决方案。 Subversion的主要特点包括： 1. **版本化文件和目录**：Subversion能够记录每次对文件和目录的修改，允许用户回滚到任何历史版本。 2. **分支和合并**：它支持创建分支，使得开发人员可以在不影响主线开发的情况下进行独立工作，然后将这些更改合并回主分支。 3. **网络透明性**：Subversion通过网络存储和访问数据，使得团队成员无论身处何处都能协同工作。 4. **可扩展性**：Subversion的架构设计允许通过插件和其他扩展来适应不同的工作流程和需求。 5. **强大的恢复能力**：由于其详尽的版本历史记录，可以轻松恢复意外删除或损坏的文件。本书的组织结构可能包括介绍Subversion的基本概念，如安装和配置Subversion服务器，设置客户端环境，以及开始使用`svn`命令行工具进行版本控制操作。此外，还可能涵盖高级主题，如分支策略、冲突解决和版本库管理。书中的例子和说明会遵循特定的排版和图标约定，以便于读者理解和学习。例如，可能会使用特定的字体和颜色来表示命令行输入、代码片段和重要提示。此外，书中还会包含关于如何阅读和利用这本书的指导，以及作者们对贡献者的感谢。对于那些熟悉Unix或Linux环境，但对版本控制不熟悉的读者，这本书提供了宝贵的资源，帮助他们理解Subversion的工作原理，并能够熟练地在日常开发工作中应用。通过学习这本书，读者可以掌握Subversion的核心功能，从而提高团队协作效率和项目管理能力。

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

for the whole family!

Appendix A, 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 descrip-

tions of Subversion revision numbers, versioned directories, offline operations, update vs. status,

branches, tags, metadata, conflict resolution, and authentication.

Appendix B, WebDAV and Autoversioning

Describes the details of WebDAV and DeltaV, and how you can configure your Subversion reposit-

ory to be mounted read/write as a DAV share.

Appendix C, Third Party Tools

Discusses tools that support or use Subversion, including alternative client programs, repository

browser tools, and so on.

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, as a part of Subversion. This

means two things:

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

• You can distribute and make changes to this book however you wish—it's under a free license. Of

course, rather than distribute your own private version of this book, we'd much rather you send feed-

back and patches to the Subversion developer community. See the section called “Contributing to

Subversion” to learn about joining this community.

A relatively recent online version of this book can be found at http://svnbook.red-bean.com.

Acknowledgments

This book would not be possible (nor very useful) if Subversion did not exist. For that, the 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;

Karl Fogel for being such a good friend and a great community leader, in that order.

Thanks to O'Reilly and our editors, Linda Mui and Tatiana Diaz for their patience and support.

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

and fixes: While this is undoubtedly not a complete list, this book would be incomplete and incorrect

without the help of: Jani Averbach, Ryan Barrett, Francois Beausoleil, Jennifer Bevan, Matt Blais, Zack

Brown, Martin Buchholz, Brane Cibej, John R. Daily, Peter Davis, Olivier Davy, Robert P. J. Day, Mo

DeJong, Brian Denny, Joe Drew, Nick Duffek, Ben Elliston, Justin Erenkrantz, Shlomi Fish, Julian

Foad, Chris Foote, Martin Furter, Dave Gilbert, Eric Gillespie, Matthew Gregan, Art Haas, Greg Hud-

son, Alexis Huxley, Jens B. Jorgensen, Tez Kamihira, David Kimdon, Mark Benedetto King, Andreas J.

Koenig, Nuutti Kotivuori, Matt Kraai, Scott Lamb, Vincent Lefevre, Morten Ludvigsen, Paul Lussier,

Bruce A. Mah, Philip Martin, Feliciano Matias, Patrick Mayweg, Gareth McCaughan, Jon Middleton,

Tim Moloney, Mats Nilsson, Joe Orton, Amy Lyn Pilato, Kevin Pilch-Bisson, Dmitriy Popkov, Michael

Price, Mark Proctor, Steffen Prohaska, Daniel Rall, Tobias Ringstrom, Garrett Rooney, Joel Rosdahl,

Christian Sauer, Larry Shatzer, Russell Steicke, Sander Striker, Erik Sjoelund, Johan Sundstroem, John

Preface

xvi

Szakmeister, Mason Thomas, Eric Wadsworth, Colin Watson, Alex Waugh, Chad Whitacre, Josef Wolf,

Blair Zajac, 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 pa-

tience! She's my perfect counterbalance.

Thanks to my extended family for their sincere encouragement, despite having no actual interest in the

subject. (You know, the ones who say, “Ooh, you're writing 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.

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 enduring 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 my wife, Amy, for her love and patient support, for putting up with late nights, and for

even reviewing entire sections of this book—you always go the extra mile, and do so with incredible

grace. Gavin, when you're old enough to read, I hope you're as proud of your Daddy as he is of you.

Mom and Dad (and the rest of the family), thanks for your constant support and enthusiasm.

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; 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.

Preface

xvii

There's also a CollabNet Team Edition (CTE) offering aimed at smaller groups.

Chapter 1. Introduction

Version control is the art of managing changes to information. It has long been a critical tool for pro-

grammers, who typically spend their time making small changes to software and then undoing those

changes the next day. But the usefulness of version control software extends far beyond the bounds of

the software development world. Anywhere you can find people using computers to manage information

that changes often, there is room for version control. And that's where Subversion comes into play.

This chapter contains a high-level introduction to Subversion—what it is; what it does; how to get it.

What is Subversion?

Subversion is a free/open-source version control system. That is, Subversion manages files and director-

ies over time. A tree of files is placed into a central repository. The repository is much like an ordinary

file server, except that it remembers every change ever made to your files and directories. 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 access its repository 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 conduit—if some incorrect change is made to the data, just undo

that change.

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

tems 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 shopping lists to digital video mixdowns and beyond.

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 Enterprise Edition (CEE)

which one component is version control. Although CEE used CVS as its initial version control system,

CVS's limitations were obvious from the beginning, 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 with the basic design of the Subversion repository. When CollabNet called,

Karl immediately agreed to work on the project, and Jim got his employer, Red Hat Software, to essen-

tially 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. With the help of some well-placed prods from Brian

Behlendorf and Jason Robbins of CollabNet, and Greg Stein (at the time an independent developer act-

ive in the WebDAV/DeltaV specification process), Subversion quickly attracted a community of active

developers. It turned out that many people had had the same frustrating experiences with CVS, and wel-

comed the chance to finally do something about it.

The original design team settled on some simple goals. They didn't want to break new ground in version

control methodology, they just wanted to fix CVS. They decided that Subversion would match CVS's

features, and preserve the same development model, but not duplicate CVS's most obvious flaws. And

although it did not need to be a drop-in replacement for CVS, it should be similar enough that any CVS

user could make the switch with little effort.

After fourteen months of coding, Subversion became “self-hosting” on August 31, 2001. That is, Sub-

version developers stopped using CVS to manage Subversion's own source code, and started using Sub-

version instead.

While CollabNet started the project, and still funds a large chunk of the work (it pays the salaries of a

few full-time Subversion developers), Subversion is run like most open-source projects, governed by a

loose, transparent set of rules that encourage meritocracy. CollabNet's copyright license is fully compli-

ant with the Debian Free Software Guidelines. In other words, anyone is free to download, modify, and

redistribute Subversion as he pleases; no permission from CollabNet or anyone else is required.

Subversion's Features

When discussing the features that Subversion brings to the version control table, it is often helpful to

speak of them in terms of how they improve upon CVS's design. If you're not familiar with CVS, you

may not understand all of these features. And if you're not familiar with version control at all, your eyes

may glaze over unless you first read Chapter 2, Basic Concepts, in which we provide a gentle introduc-

tion to version control in general.

Subversion provides:

Directory versioning

CVS only tracks the history of individual files, but Subversion implements a “virtual” versioned

filesystem that tracks changes to whole directory trees over time. Files and directories are ver-

sioned.

True version history

Since CVS is limited to file versioning, operations such as copies and renames—which might hap-

pen to files, but which are really changes to the contents of some containing directory—aren't sup-

ported in CVS. Additionally, in CVS you cannot replace a versioned file with some new thing of the

same name without the new item inheriting the history of the old—perhaps completely unre-

lated—file. With Subversion, you can add, delete, copy, and rename both files and directories. And

every newly added file begins with a fresh, clean history all its own.

Atomic commits

A collection of modifications either goes into the repository completely, or not at all. This allows

developers to construct and commit changes as logical chunks, and prevents problems that can oc-

cur when only a portion of a set of changes is successfully sent to the repository.

Versioned metadata

Each file and directory has a set of properties—keys and their values—associated with it. You can

create and store any arbitrary key/value pairs you wish. Properties are versioned over time, just like

file contents.

Choice of network layers

Subversion has an abstracted notion of repository access, making it easy for people to implement

new network mechanisms. Subversion can plug into the Apache HTTP Server as an extension mod-

Introduction

剩余327页未读，继续阅读

edwardsayer

粉丝: 0
资源: 3

Subversion 1.3：版本控制系统指南

subversion-1.3.2.tar.gz

Subversion 帮助手册 - Version Control with Subversion For Subversion 1.6

Version Control with Subversion For Subversion 1.7

Version Control with Subversion

Pragmatic version control with subversion

Pragmatic Version Control With Subversion

Version Control with Subversion.pdf

Version Control with Subversion 2nd Edition

Version Control with Subversion_en

带有Subversion的版本控制Version Control with Subversion

最新资源