Version Control With Subversion by Pilato, C. Michael -- Read -- Imperial Library of Trantor

Index

Version Control with Subversion

Foreword Preface

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 Conventions Used in This Book Organization of This Book This Book Is Free Using Code Examples Safari® Books Online How to Contact Us Acknowledgments

From Ben Collins-Sussman From Brian W. Fitzpatrick From C. Michael Pilato

1. Fundamental Concepts

The Repository Versioning Models

The Problem of File Sharing The Lock-Modify-Unlock Solution The Copy-Modify-Merge Solution

Subversion in Action

Subversion Repository URLs 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

2. Basic Usage

Help! Getting Data into Your Repository

svn import Recommended Repository Layout

Initial Checkout

Disabling Password Caching Authenticating As a Different User

Basic Work Cycle

Update Your Working Copy Make Changes to Your Working Copy Examine Your Changes

See an overview of your changes Examine the details of your local modifications

Undoing Working Changes Resolve Conflicts (Merging Others’ Changes)

Viewing conflict differences interactively Resolving conflict differences interactively Postponing conflict resolution Merging conflicts by hand Discarding your changes in favor of a newly fetched revision Punting: using svn revert

Commit Your Changes

Examining History

Generating a List of Historical Changes Examining the Details of Historical Changes

Examining local changes Comparing working copy to repository Comparing repository revisions

Browsing the Repository

svn cat svn list

Fetching Older Repository Snapshots

Sometimes You Just Need to Clean Up

Disposing of a Working Copy Recovering from an Interruption

Summary

3. Advanced Topics

Revision Specifiers

Revision Keywords Revision Dates

Properties

Why Properties? Manipulating Properties Properties and the Subversion Workflow Automatic Property Setting

File Portability

File Content Type File Executability End-of-Line Character Sequences

Ignoring Unversioned Items Keyword Substitution Sparse Directories Locking

Creating Locks Discovering Locks Breaking and Stealing Locks Lock Communication

Externals Definitions Peg and Operative Revisions Changelists

Creating and Modifying Changelists Changelists As Operation Filters Changelist Limitations

Network Model

Requests and Responses Client Credentials Caching

Summary

4. Branching and Merging

What’s a Branch? Using Branches

Creating a Branch Working with Your Branch The Key Concepts Behind Branching

Basic Merging

Changesets Keeping a Branch in Sync Mergeinfo and Previews Undoing Changes Resurrecting Deleted Items

Advanced Merging

Cherrypicking Merge Syntax: Full Disclosure Merges Without Mergeinfo More on Merge Conflicts Blocking Changes Merge-Sensitive Logs and Annotations Noticing or Ignoring Ancestry Merges and Moves Blocking Merge-Unaware Clients The Final Word on Merge Tracking

Traversing Branches Tags

Creating a Simple Tag Creating a Complex Tag

Branch Maintenance

Repository Layout Data Lifetimes

Common Branching Patterns

Release Branches Feature Branches

Vendor Branches

General Vendor Branch Management Procedure svn_load_dirs.pl

Summary

5. Repository Administration

The Subversion Repository, Defined Strategies for Repository Deployment

Planning Your Repository Organization Deciding Where and How to Host Your Repository Choosing a Data Store

Berkeley DB FSFS

Creating and Configuring Your Repository

Creating the Repository Implementing Repository Hooks Berkeley DB Configuration

Repository Maintenance

An Administrator’s Toolkit

svnadmin svnlook svndumpfilter svnsync fsfs-reshard.py Berkeley DB utilities

Commit Log Message Correction Managing Disk Space

How Subversion saves disk space Removing dead transactions Purging unused Berkeley DB logfiles

Berkeley DB Recovery Migrating Repository Data Elsewhere Filtering Repository History Repository Replication Repository Backup Managing Repository UUIDs

Moving and Removing Repositories Summary

6. Server Configuration

Overview Choosing a Server Configuration

The svnserve Server svnserve over SSH The Apache HTTP Server Recommendations

svnserve, a Custom Server

Invoking the Server

svnserve as daemon svnserve via inetd svnserve over a tunnel svnserve as Windows service

Built-in Authentication and Authorization

Create a users file and realm Set access controls

Using svnserve with SASL

Authenticating with SASL SASL encryption

Tunneling over SSH SSH configuration tricks

Initial setup Controlling the invoked command

httpd, the Apache HTTP Server

Prerequisites Basic Apache Configuration Authentication Options

Setting up HTTP authentication SSL certificate management

Authorization Options

Blanket access control Per-directory access control Disabling path-based checks

Extra Goodies

Repository browsing

Proper MIME type Customizing the look Listing repositories

Apache logging Write-through proxying

Configure the servers Set up replication Caveats

Other Apache features

Path-Based Authorization Supporting Multiple Repository Access Methods

7. Customizing Your Subversion Experience

Runtime Configuration Area

Configuration Area Layout Configuration and the Windows Registry Configuration Options

Servers Config

Localization

Understanding Locales Subversion’s Use of Locales

Using External Editors Using External Differencing and Merge Tools

External diff External diff3

Summary

8. Embedding Subversion

Layered Library Design

Repository Layer Repository Access Layer Client Layer

Inside the Working Copy Administration Area

The Entries File Pristine Copies and Property Files

Using the APIs

The Apache Portable Runtime Library URL and Path Requirements Using Languages Other Than C and C++ Code Samples

Summary

9. Subversion Complete Reference

The Subversion Command-Line Client: svn

svn Options svn Subcommands

svn add svn blame svn cat svn changelist 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 mergeinfo svn mkdir svn move svn propdel svn propedit svn propget svn proplist svn propset svn resolve svn resolved svn revert svn status svn switch svn unlock svn update

svnadmin

svnadmin Options svnadmin Subcommands

svnadmin crashtest 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 setrevprop svnadmin setuuid svnadmin upgrade svnadmin verify

svnlook

svnlook Options svnlook Subcommands

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

svnsync

svnsync Options svnsync Subcommands

svnsync copy-revprops svnsync help svnsync initialize svnsync synchronize

svnserve

svnserve Options

svndumpfilter

svndumpfilter Options svndumpfilter Subcommands

svndumpfilter exclude svndumpfilter include svndumpfilter help

svnversion

svnversion Options svnversion Examples

mod_dav_svn Configuration Directives

Directives High-Level Logging

mod_authz_svn

Directives

Subversion Properties

Versioned Properties Unversioned Properties

Repository Hooks

start-commit pre-commit post-commit pre-revprop-change post-revprop-change pre-lock post-lock pre-unlock post-unlock

A. Subversion Quick-Start Guide

Installing Subversion High-Speed Tutorial

B. Subversion for CVS Users

Revision Numbers Are Different Now Directory Versions More Disconnected Operations Distinction Between Status and Update

Status Update

Branches and Tags Metadata Properties Conflict Resolution Binary Files and Translation Versioned Modules Authentication Converting a Repository from CVS to Subversion

C. WebDAV and Autoversioning

What Is WebDAV? 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

D. Copyright

Creative Commons Legal Code

Attribution 2.0

License

Index About the Authors Colophon

← Prev
Back
Next →

← Prev
Back
Next →