Version Control with Subversion

Table of Contents

Foreword

Preface

Audience

How to Read this Book

Conventions Used in This Book

Typographic Conventions

Icons

Organization of This Book

This Book is Free

Acknowledgments

From Ben Collins-Sussman

From Brian W. Fitzpatrick

From C. Michael Pilato

1. Introduction

What is Subversion?

Subversion's History

Subversion's Features

Subversion's Architecture

Installing Subversion

Subversion's Components

A Quick Start

2. Basic Concepts

The Repository

Versioning Models

The Problem of File-Sharing

The Lock-Modify-Unlock Solution

The Copy-Modify-Merge Solution

Subversion in Action

Working Copies

Revisions

How Working Copies Track the Repository

Mixed Revision Working Copies

Updates and Commits are Separate

Mixed revisions are normal

Mixed revisions are useful

Mixed revisions have limitations

Summary

3. Guided Tour

Help!

Import

Revisions: Numbers, Keywords, and Dates, Oh My!

Revision Numbers

Revision Keywords

Revision Dates

Initial Checkout

Basic Work Cycle

Update Your Working Copy

Make Changes to Your Working Copy

Examine Your Changes

svn status

svn diff

svn revert

Resolve Conflicts (Merging Others' Changes)

Merging Conflicts by Hand

Copying a File Onto Your Working File

Punting: Using svn revert

Commit Your Changes

Examining History

svn log

svn diff

Examining Local Changes

Comparing Working Copy to Repository

Comparing Repository to Repository

svn cat

svn list

A Final Word on History

Other Useful Commands

svn cleanup

svn import

Summary

4. Branching and Merging

What's a Branch?

Using Branches

Creating a Branch

Working with Your Branch

The Key Concepts Behind Branches

Copying Changes Between Branches

Copying Specific Changes

The Key Concept Behind Merging

Best Practices for Merging

Tracking Merges Manually

Previewing Merges

Merge Conflicts

Noticing or Ignoring Ancestry

Common Use-Cases

Merging a Whole Branch to Another

Undoing Changes

Resurrecting Deleted Items

Common Branching Patterns

Release Branches

Feature Branches

Switching a Working Copy

Tags

Creating a Simple Tag

Creating a Complex Tag

Branch Maintenance

Repository Layout

Data Lifetimes

Summary

5. Repository Administration

Repository Basics

Understanding Transactions and Revisions

Unversioned Properties

Repository Data Stores

Berkeley DB

FSFS

Repository Creation and Configuration

Hook Scripts

Berkeley DB Configuration

Repository Maintenance

An Administrator's Toolkit

svnlook

svnadmin

svndumpfilter

Berkeley DB Utilities

Repository Cleanup

Managing Disk Space

Repository Recovery

Migrating a Repository

Repository Backup

Adding Projects

Choosing a Repository Layout

Creating the Layout, and Importing Initial Data

Summary

6. Server Configuration

Overview

Network Model

Requests and Responses

Client Credentials Caching

svnserve, a custom server

Invoking the Server

Built-in authentication and authorization

Create a 'users' file and realm

Set access controls

SSH authentication and authorization

SSH configuration tricks

Initial setup

Controlling the invoked command

httpd, the Apache HTTP server

Prerequisites

Basic Apache Configuration

Authentication Options

Basic HTTP Authentication

SSL Certificate Management

Authorization Options

Blanket Access Control

Per-Directory Access Control

Disabling Path-based Checks

Extra Goodies

Repository Browsing

Other Features

Supporting Multiple Repository Access Methods

7. Advanced Topics

Runtime Configuration Area

Configuration Area Layout

Configuration and the Windows Registry

Configuration Options

Servers

Config

Properties

Why Properties?

Manipulating Properties

Special Properties

svn:executable

svn:mime-type

svn:ignore

svn:keywords

svn:eol-style

svn:externals

svn:special

svn:needs-lock

Automatic Property Setting

Locking

Creating locks

Discovering locks

Breaking and stealing locks

Lock Communication

Peg and Operative Revisions

Externals Definitions

Vendor branches

General Vendor Branch Management Procedure

svn_load_dirs.pl

Localization

Understanding locales

Subversion's use of locales

Using External Differencing Tools

External diff

External diff3

Subversion Repository URLs

8. Developer Information

Layered Library Design

Repository Layer

Repository Access Layer

RA-DAV (Repository Access Using HTTP/DAV)

RA-SVN (Custom Protocol Repository Access)

RA-Local (Direct Repository Access)

Your RA Library Here

Client Layer

Using the APIs

The Apache Portable Runtime Library

URL and Path Requirements

Using Languages Other than C and C++

Inside the Working Copy Administration Area

The Entries File

Pristine Copies and Property Files

WebDAV

Programming with Memory Pools

Contributing to Subversion

Join the Community

Get the Source Code

Become Familiar with Community Policies

Make and Test Your Changes

Donate Your Changes

9. Subversion Complete Reference

The Subversion Command Line Client: svn

svn Switches

svn Subcommands

svn add

svn blame

svn cat

svn checkout

svn cleanup

svn commit

svn copy

svn delete

svn diff

svn export

svn help

svn import

svn info

svn list

svn lock

svn log

svn merge

svn mkdir

svn move

svn propdel

svn propedit

svn propget

svn proplist

svn propset

svn resolved

svn revert

svn status

svn switch

svn unlock

svn update

svnadmin

svnadmin Switches

svnadmin Subcommands

svnadmin create

svnadmin deltify

svnadmin dump

svnadmin help

svnadmin hotcopy

svnadmin list-dblogs

svnadmin list-unused-dblogs

svnadmin load

svnadmin lslocks

svnadmin lstxns

svnadmin recover

svnadmin rmlocks

svnadmin rmtxns

svnadmin setlog

svnadmin verify

svnlook

svnlook Switches

svnlook

svnlook author

svnlook cat

svnlook changed

svnlook date

svnlook diff

svnlook dirs-changed

svnlook help

svnlook history

svnlook info

svnlook lock

svnlook log

svnlook propget

svnlook proplist

svnlook tree

svnlook uuid

svnlook youngest

svnserve

svnserve Switches

svnversion

svnversion

mod_dav_svn

mod_dav_svn Configuration Directives

A. Subversion for CVS Users

Revision Numbers Are Different Now

Directory Versions

More Disconnected Operations

Distinction Between Status and Update

Branches and Tags

Metadata Properties

Conflict Resolution

Binary Files and Translation

Versioned Modules

Authentication

Converting a Repository from CVS to Subversion

B. WebDAV and Autoversioning

Basic WebDAV Concepts

Original WebDAV

DeltaV Extensions

Subversion and DeltaV

Autoversioning

Client Interoperability

Standalone WebDAV applications

Microsoft Office, Dreamweaver, Photoshop

Cadaver, DAV Explorer

File-explorer WebDAV extensions

Microsoft Web Folders

Nautilus, Konqueror

WebDAV filesystem implementation

WebDrive, NetDrive

Mac OS X

Linux davfs2

C. Third Party Tools

D. Copyright