[svnbook] r3803 committed - * src/en/book/ch02-basic-usage.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Fri Oct 15 12:38:49 CDT 2010
Revision: 3803
Author: cmpilato at gmail.com
Date: Fri Oct 15 10:38:16 2010
Log: * src/en/book/ch02-basic-usage.xml
Thicken up with prose the boring nested list of basic work cycle
elements.
http://code.google.com/p/svnbook/source/detail?r=3803
Modified:
/trunk/src/en/book/ch02-basic-usage.xml
=======================================
--- /trunk/src/en/book/ch02-basic-usage.xml Fri Oct 15 08:47:24 2010
+++ /trunk/src/en/book/ch02-basic-usage.xml Fri Oct 15 10:38:16 2010
@@ -335,19 +335,20 @@
<sect1 id="svn.tour.initial">
<title>Creating a Working Copy</title>
- <para>
- <indexterm>
- <primary>svn</primary>
- <secondary>subcommands</secondary>
- <tertiary>checkout</tertiary>
- </indexterm>
- Most of the time, you will start using a Subversion repository
- by performing a <firstterm>checkout</firstterm> of your project.
- Checking out a directory from a repository creates a working
- copy of that directory on your local machine. Unless otherwise
- specified, this copy contains the youngest (that is, most
- recently created or modified) versions of the directory and its
- children found in the Subversion repository:</para>
+ <indexterm>
+ <primary>svn</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>checkout</tertiary>
+ </indexterm>
+
+ <para>Most of the time, you will start using a Subversion
+ repository by performing a <firstterm>checkout</firstterm> of
+ your project. Checking out a directory from a repository
+ creates a working copy of that directory on your local machine.
+ Unless otherwise specified, this copy contains the youngest
+ (that is, most recently created or modified) versions of the
+ directory and its children found in the Subversion
+ repository:</para>
<screen>
$ svn checkout http://host.example.com/svn/repo/trunk
@@ -380,7 +381,7 @@
you can immediately make changes to the files and directories in
your working copy. Your working copy is just like any other
collection of files and directories on your system. You can
- edit and change it, move it around, even delete the entire
+ edit the files inside it, rename it, even delete the entire
working copy and forget about it.</para>
<warning>
@@ -464,74 +465,52 @@
<orderedlist>
<listitem>
- <para>Update your working copy.</para>
- <itemizedlist>
- <listitem>
- <para><command>svn update</command></para>
- </listitem>
- </itemizedlist>
-
+ <para><emphasis>Update your working copy.</emphasis> This
+ involves the use of the <command>svn update</command>
+ command.</para>
</listitem>
-
<listitem>
- <para>Make changes.</para>
- <itemizedlist>
- <listitem>
- <para><command>svn add</command></para>
- </listitem>
- <listitem>
- <para><command>svn delete</command></para>
- </listitem>
- <listitem>
- <para><command>svn copy</command></para>
- </listitem>
- <listitem>
- <para><command>svn move</command></para>
- </listitem>
- </itemizedlist>
+ <para><emphasis>Make changes.</emphasis> The most common
+ changes that you'll make are edits to the contents of your
+ existing files. But sometimes you need to add, remove, copy
+ and move files and directories—the <command>svn
+ add</command>, <command>svn delete</command>, <command>svn
+ copy</command>, and <command>svn move</command> commands
+ handle those sorts of structural changes within the working
+ copy.</para>
</listitem>
-
<listitem>
- <para>Examine your changes.</para>
- <itemizedlist>
- <listitem>
- <para><command>svn status</command></para>
- </listitem>
- <listitem>
- <para><command>svn diff</command></para>
- </listitem>
- </itemizedlist>
+ <para><emphasis>Review your changes.</emphasis>
+ The <command>svn status</command> and <command>svn
+ diff</command> commands are critical to reviewing the
+ changes you've made in your working copy.</para>
</listitem>
-
<listitem>
- <para>Possibly undo some changes.</para>
- <itemizedlist>
- <listitem>
- <para><command>svn revert</command></para>
- </listitem>
- </itemizedlist>
+ <para><emphasis>Fix your mistakes.</emphasis> Nobody's
+ perfect, so as you review your changes, you may spot
+ something that's not quite right. Sometimes the easiest way
+ to fix a mistake is start all over again from scratch.
+ The <command>svn revert</command> command restores a file
+ or directory to its unmodified state.</para>
</listitem>
-
-
<listitem>
- <para>Resolve conflicts (merge others' changes).</para>
- <itemizedlist>
- <listitem>
- <para><command>svn update</command></para>
- </listitem>
- <listitem>
- <para><command>svn resolve</command></para>
- </listitem>
- </itemizedlist>
+ <para><emphasis>Resolve conflicts (merge others'
+ changes).</emphasis> In the time it takes you to make and
+ review your changes, others might have made and published
+ changes, too. You'll want to integrate their changes into
+ your working copy to avoid the potential out-of-dateness
+ scenarios when you attempt to publish your own. Again,
+ the <command>svn update</command> command is the way to do
+ this. If this results in local conflicts, you'll need to
+ resolve those using the <command>svn resolve</command>
+ command.</para>
</listitem>
-
<listitem>
- <para>Commit your changes.</para>
- <itemizedlist>
- <listitem>
- <para><command>svn commit</command></para>
- </listitem>
- </itemizedlist>
+ <para><emphasis>Publish (commit) your changes.</emphasis>
+ The <command>svn commit</command> command transmits your
+ changes to the repository where, if they are accepted, they
+ create the newest versions of all the things you modified.
+ Now others can see your work, too!</para>
</listitem>
</orderedlist>
More information about the svnbook-dev
mailing list