[svnbook] r3849 committed - * src/en/book/ch01-fundamental-concepts.xml...

svnbook at googlecode.com svnbook at googlecode.com
Tue Jun 28 09:56:29 CDT 2011


Revision: 3849
Author:   cmpilato at gmail.com
Date:     Tue Jun 28 07:56:17 2011
Log:      * src/en/book/ch01-fundamental-concepts.xml
   Minor wording tweaks.  Note that 'svn' requires a slash after the
   caret in the URL shorthand syntax.  Rename a figure from 'The
   repository' to 'Tree changes over time'.

http://code.google.com/p/svnbook/source/detail?r=3849

Modified:
  /trunk/src/en/book/ch01-fundamental-concepts.xml

=======================================
--- /trunk/src/en/book/ch01-fundamental-concepts.xml	Thu Dec  2 14:31:50  
2010
+++ /trunk/src/en/book/ch01-fundamental-concepts.xml	Tue Jun 28 07:56:17  
2011
@@ -1,12 +1,11 @@
  <chapter id="svn.basic">
    <title>Fundamental Concepts</title>

-  <para>This chapter is a short, casual introduction to Subversion.
-    If you're new to version control, this chapter is definitely for
-    you.  We begin with a discussion of general version control
-    concepts, work our way into the specific ideas behind
-    Subversion, and show some simple examples of Subversion in
-    use.</para>
+  <para>This chapter is a short, casual introduction to Subversion and
+    its approach to version control.  We begin with a discussion of
+    general version control concepts, work our way into the specific
+    ideas behind Subversion, and show some simple examples of
+    Subversion in use.</para>

    <para>Even though the examples in this chapter show people sharing
      collections of program source code, keep in mind that Subversion
@@ -444,7 +443,7 @@
          of the way the repository looked after a commit.</para>

        <figure id="svn.basic.in-action.revs.dia-1">
-        <title>The repository</title>
+        <title>Tree changes over time</title>
          <graphic fileref="images/ch02dia7.png"/>
        </figure>

@@ -632,7 +631,11 @@
          root of the repository.  Note that this URL syntax works only
          when your current working directory is a working
          copy—the command-line client knows the repository's root
-        URL by looking at the working copy's metadata.</para>
+        URL by looking at the working copy's metadata.  Note that when
+        you wish to refer precisely to the root directory of the
+        repository, you must do so using <literal>^/</literal> (with
+        the trailing slash character), not merely
+        <literal>^</literal>.</para>

      </sect2>

@@ -664,6 +667,8 @@
          those changes into your working copy (by reading from the
          repository).</para>

+      <!-- ### TODO:  This will change in 1.7! -->
+
        <para>A working copy also contains some extra files, created and
          maintained by Subversion, to help it carry out these commands.
          In particular, each directory in your working copy contains a
@@ -795,7 +800,7 @@
            out</firstterm> some subtree of the repository.  (The term
            <emphasis>check out</emphasis> may sound like it has something  
to do
            with locking or reserving resources, but it doesn't; it simply
-          creates a private copy of the project for you.)  For example,
+          creates a working copy of the project for you.)  For example,
            if you check out <filename>/calc</filename>, you will get a
            working copy like this:</para>

@@ -1083,6 +1088,9 @@
              committing a property change to an out-of-date directory may
              destroy properties you've not yet seen.</para>

+           <!-- ### TODO: In Subversion 1.7, you cannot merge into a
+                ### mixed-rev working copy by default -->
+
          </sect4>
        </sect3>
      </sect2>




More information about the svnbook-dev mailing list