Version Control with Subversion
   Next

Version Control with Subversion

For Subversion 1.2

(book compiled from Revision 107)

Ben Collins-Sussman

Brian W. Fitzpatrick

C. Michael Pilato

Copyright © 2002, 2003, 2004, 2005, 2006 Ben Collins-Sussman, Brian W. Fitzpatrick, C. Michael Pilato

Ce travail est publié sous licence Creative Commons Attribution. Pour consulter une copie de cette licence, visitez http://creativecommons.org/licenses/by/2.0/ ou envoyez une lettre à Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.

(TBA)

Table of Contents

Avant-Propos
Préface
Audience
Comment lire ce livre
Conventions utilisées dans ce livre
Conventions typographiques
Icônes
Organisation de ce livre
Ce livre est gratuit/libre
Remerciements
Ben Collins-Sussman
Brian W. Fitzpatrick
C. Michael Pilato
1. Introduction
Qu'est-ce que Subversion?
L'Histoire de Subversion
Caractéristiques de Subversion
L'Architecture de Subversion
Installer Subversion
Les Composants de Subversion
Pour commencer rapidement
2. Concepts de base
Le dépôt
Modèles de Contrôle de Version
Le problème du partage de fichier
La solution du "Verrouiller-Modifier-Libérer"
La solution du "Copier-Modifier-Fusionner"
Subversion en Action
Copie de travail
Révisions
Comment les copies de travail scrutent le dépôt
Copies de Travail Contenant Plusieurs Révisions
Les Soumissions et Mises à jour sont séparées
Les révisions mixtes sont normales
Les Révisions mixtes sont utiles
Limitations des révisions mixtes
Résumé
3. Visite Guidée
À l'Aide !
Import
Révisions : Numéros, Identifiants Symboliques et Dates, Oulah !
Numéros de Révision
Identifiants de Révision Symboliques
Dates de Révision
Extraction (“Ckeckout”) initiale
Processus basique de travail
Mettre à Jour Votre Copie de Travail
Modifiez Votre Copie de Travail
Consultez vos modifications
svn status
svn diff
svn revert
Résolution des conflits (fusionner les modifications des autres)
Fusion des conflits à la main
Remplacer votre copie de travail
Annuler : utiliser svn revert
Propagez Vos Modifications
Consulter l'Historique
svn log
svn diff
Consulter les Modifications Locales
Comparer la Copie de Travail avec le Dépôt
Comparer le Dépôt avec le Dépôt
svn cat
svn list
Un Dernier Mot à propos de l'Historique
D'Autres Commandes Utiles
svn cleanup
svn import
Résumé
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. Administration du dépôt
Les bases du dépôt
Comprendre les transactions et les révisions
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. Référence Complète de Subversion
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
Subversion properties
Subversion-defined properties
A. Subversion pour les utilisateurs de CVS
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
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

List of Figures

1.1. L'Architecture de Subversion
2.1. Un système classique orienté client/serveur
2.2. Le problème à supprimer
2.3. Le modèle Verrouiller-Modifier-Libérer
2.4. La solution du Copier-Modifier-Fusionner
2.5. La solution du Copier-Modifier-Fusionner (suite)
2.6. Le système de fichier du dépôt
2.7. Le dépôt
4.1. Branches of development
4.2. Starting repository layout
4.3. Repository with new copy
4.4. The branching of one file's history
8.1. Files and directories in two dimensions
8.2. Versioning time—the third dimension!

List of Tables

2.1. Accès URLs au dépôt
5.1. Repository Data Store Comparison
6.1. Network Server Comparison
8.1. A Brief Inventory of the Subversion Libraries
B.1. Common WebDAV Clients

List of Examples

5.1. txn-info.sh (Reporting Outstanding Transactions)
6.1. A sample configuration for anonymous access.
6.2. A sample configuration for authenticated access.
6.3. A sample configuration for mixed authenticated/anonymous access.
6.4. Disabling path checks altogether
7.1. Sample Registration Entries (.reg) File.
7.2. diffwrap.sh
7.3. diffwrap.bat
7.4. diff3wrap.sh
7.5. diff3wrap.bat
8.1. Using the Repository Layer
8.2. Using the Repository Layer with Python
8.3. A Python Status Crawler
8.4. Contents of a Typical .svn/entries File
8.5. Effective Pool Usage
   Next
   Avant-Propos