<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 2. Basic Usage</title><link rel="stylesheet" href="styles.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.73.2" /><link rel="start" href="index.html" title="Version Control with Subversion" /><link rel="up" href="index.html" title="Version Control with Subversion" /><link rel="prev" href="svn.basic.summary.html" title="Summary" /><link rel="next" href="svn.tour.help.html" title="Help!" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 2. Basic Usage</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="svn.basic.summary.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="svn.tour.help.html">Next</a></td></tr></table><hr /></div><div class="chapter" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title"><a id="svn.tour"></a>Chapter 2. Basic Usage</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="svn.tour.help.html">Help!</a></span></dt><dt><span class="sect1"><a href="svn.tour.importing.html">Getting Data into your Repository</a></span></dt><dd><dl><dt><span class="sect2"><a href="svn.tour.importing.html#svn.tour.importing.import">svn import</a></span></dt><dt><span class="sect2"><a href="svn.tour.importing.html#svn.tour.importing.layout">Recommended repository layout</a></span></dt></dl></dd><dt><span class="sect1"><a href="svn.tour.initial.html">Initial Checkout</a></span></dt><dd><dl><dt><span class="sect2"><a href="svn.tour.initial.html#svn.tour.initial.disabling-password-caching">Disabling Password Caching</a></span></dt><dt><span class="sect2"><a href="svn.tour.initial.html#svn.tour.initial.different-user">Authenticating as a Different User</a></span></dt></dl></dd><dt><span class="sect1"><a href="svn.tour.cycle.html">Basic Work Cycle</a></span></dt><dd><dl><dt><span class="sect2"><a href="svn.tour.cycle.html#svn.tour.cycle.update">Update Your Working Copy</a></span></dt><dt><span class="sect2"><a href="svn.tour.cycle.html#svn.tour.cycle.edit">Make Changes to Your Working Copy</a></span></dt><dt><span class="sect2"><a href="svn.tour.cycle.html#svn.tour.cycle.examine">Examine Your Changes</a></span></dt><dd><dl><dt><span class="sect3"><a href="svn.tour.cycle.html#svn.tour.cycle.examine.status">See an overview of your changes</a></span></dt><dt><span class="sect3"><a href="svn.tour.cycle.html#svn.tour.cycle.examine.diff">Examine the details of your local modifications</a></span></dt></dl></dd><dt><span class="sect2"><a href="svn.tour.cycle.html#svn.tour.cycle.revert">Undoing Working Changes</a></span></dt><dt><span class="sect2"><a href="svn.tour.cycle.html#svn.tour.cycle.resolve">Resolve Conflicts (Merging Others' Changes)</a></span></dt><dd><dl><dt><span class="sect3"><a href="svn.tour.cycle.html#svn.tour.cycle.resolve.diff">Viewing Conflict Differences Interactively</a></span></dt><dt><span class="sect3"><a href="svn.tour.cycle.html#svn.tour.cycle.resolve.resolve">Resolving Conflict Differences Interactively</a></span></dt><dt><span class="sect3"><a href="svn.tour.cycle.html#svn.tour.cycle.resolve.pending">Postponing Conflict Resolution</a></span></dt><dt><span class="sect3"><a href="svn.tour.cycle.html#svn.tour.cycle.resolve.byhand">Merging Conflicts by Hand</a></span></dt><dt><span class="sect3"><a href="svn.tour.cycle.html#svn.tour.cycle.resolve.copyover">Copying a File Onto Your Working File</a></span></dt><dt><span class="sect3"><a href="svn.tour.cycle.html#svn.tour.cycle.resolve.revert">Punting: Using <span class="command"><strong>svn revert</strong></span></a></span></dt></dl></dd><dt><span class="sect2"><a href="svn.tour.cycle.html#svn.tour.cycle.commit">Commit Your Changes</a></span></dt></dl></dd><dt><span class="sect1"><a href="svn.tour.history.html">Examining History</a></span></dt><dd><dl><dt><span class="sect2"><a href="svn.tour.history.html#svn.tour.history.log">Generating a list of historical changes</a></span></dt><dt><span class="sect2"><a href="svn.tour.history.html#svn.tour.history.diff">Examining the details of historical changes</a></span></dt><dd><dl><dt><span class="sect3"><a href="svn.tour.history.html#svn.tour.history.diff.local">Examining Local Changes</a></span></dt><dt><span class="sect3"><a href="svn.tour.history.html#svn.tour.history.diff.wcrepos">Comparing Working Copy to Repository</a></span></dt><dt><span class="sect3"><a href="svn.tour.history.html#svn.tour.history.diff.reposrepos">Comparing Repository to Repository</a></span></dt></dl></dd><dt><span class="sect2"><a href="svn.tour.history.html#svn.tour.history.browsing">Browsing the repository</a></span></dt><dd><dl><dt><span class="sect3"><a href="svn.tour.history.html#svn.tour.history.browsing.cat"><span class="command"><strong>svn cat</strong></span></a></span></dt><dt><span class="sect3"><a href="svn.tour.history.html#svn.tour.history.browsing.list"><span class="command"><strong>svn list</strong></span></a></span></dt></dl></dd><dt><span class="sect2"><a href="svn.tour.history.html#svn.tour.history.snapshots">Fetching older repository snapshots</a></span></dt></dl></dd><dt><span class="sect1"><a href="svn.tour.cleanup.html">Sometimes You Just Need to Clean Up</a></span></dt><dd><dl><dt><span class="sect2"><a href="svn.tour.cleanup.html#svn.tour.cleanup.disposal">Disposing of a Working Copy</a></span></dt><dt><span class="sect2"><a href="svn.tour.cleanup.html#svn.tour.cleanup.interruption">Recovering From an Interruption</a></span></dt></dl></dd><dt><span class="sect1"><a href="svn.tour.summary.html">Summary</a></span></dt></dl></div><p>Now we will go into the details of using Subversion. By the
time you reach the end of this chapter, you will be able to
perform all the tasks you need to use Subversion in a normal day's
work. You'll start with getting your files into Subversion,
followed by an initial checkout of your code. We'll then walk you
through making changes and examining those changes. You'll also
see how to bring changes made by others into your working copy,
examine them, and work through any conflicts that might
arise.</p><p>Note that this chapter is not meant to be an exhaustive list
of all Subversion's commands—rather, it's a conversational
introduction to the most common Subversion tasks you'll
encounter. This chapter assumes that you've read and understood
<a class="xref" href="svn.basic.html" title="Chapter 1. Fundamental Concepts">Chapter 1, <i>Fundamental Concepts</i></a> and are familiar with the general
model of Subversion. For a complete reference of all commands,
see <a class="xref" href="svn.ref.html" title="Chapter 9. Subversion Complete Reference">Chapter 9, <i>Subversion Complete Reference</i></a>.</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="svn.basic.summary.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="svn.tour.help.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Summary </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Help!</td></tr></table></div></body></html>
