[svnbook commit] r2637 - branches/fitz-ripping-up-ch-02/src/en/book

cmpilato noreply at red-bean.com
Wed Jan 31 08:01:02 CST 2007


Author: cmpilato
Date: Wed Jan 31 08:01:01 2007
New Revision: 2637

Modified:
   branches/fitz-ripping-up-ch-02/src/en/book/ch-basic-usage.xml

Log:
Merge Fitz's misdirected r2636 change onto his private branch.

Modified: branches/fitz-ripping-up-ch-02/src/en/book/ch-basic-usage.xml
==============================================================================
--- branches/fitz-ripping-up-ch-02/src/en/book/ch-basic-usage.xml	(original)
+++ branches/fitz-ripping-up-ch-02/src/en/book/ch-basic-usage.xml	Wed Jan 31 08:01:01 2007
@@ -4,7 +4,7 @@
   <para>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 almost all the tasks you need to use Subversion in a
-    normal day's work.  You'll start with an initial checkout of
+    normal day's work.  TODO:fix You'll start with an initial checkout of
     your code, and walk 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
@@ -39,8 +39,30 @@
   <!-- ================================================================= -->
   <!-- ================================================================= -->
   <sect1 id="svn.tour.import">
-    <title>Import</title>
+    <title>Getting Data into your Repository</title>
 
+    There are several different ways to get data into your Subversion
+    repository.  There's svn import, which is usually used if you want
+    to put an existing tree of files into your repository as a unique
+    project, but if you already have a working copy, svn add followed
+    by svn commit will basically do the same thing.
+
+    svn import:
+    - Doesn't require a working copy
+    - Immediate commit
+    - Usually used to place new projects into Subversion
+
+    svn add && svn commit:
+    - Requires a working copy
+    - Usually used to augment projects already in Subversion
+    - Requires a separate commit step
+    - Can be reverted without touching the repository
+
+    TODO: recommended layout
+    
+    TODO: talk about import in depth?  Check notes.
+
+TODO: zap this
     <para>You use <command>svn import</command> to import a new
       project into a Subversion repository.  While this is most likely
       the very first thing you will do when you set up your Subversion
@@ -48,70 +70,49 @@
       detailed description of import, see <xref
       linkend="svn.tour.other.import"/> later in this chapter.</para>
 
-  </sect1>
 
-  <!-- ================================================================= -->
-  <!-- ================================================================= -->
-  <!-- ================================================================= -->
-  <sect1 id="svn.tour.revs">
-    <title>Time Travel with Subversion</title>
+    <!-- =============================================================== -->
+    <sect2 id="svn.tour.other.import">
+      <title><command>svn import</command></title>
 
-    <para>As discussed in <xref linkend="svn.basic.in-action.revs"/>,
-      a revision is a <quote>snapshot</quote> of the repository at a
-      particular moment in time.  But the thing that makes
-      Subversion—or any other version control
-      system—useful is not that it keeps all the versions of
-      your files and directories over time.  It's that you can
-      actually <emphasis>do something</emphasis> with those older
-      versions!  And to do this sort of time travelling, you need a
-      mechanism for identifying revision snapshots.</para>
-
-    <para>Revision numbers in Subversion are pretty
-      straightforward—just monotonically increasing integers.
-      When you create a new Subversion repository, it begins its life
-      at revision 0 and each successive commit increases the revision
-      number by one.  Subversion doesn't try to hide these
-      numbers—they are a part of the interface you have into the
-      history of your versioned data.  For example, after you perform
-      a commit, the Subversion client informs you of the new revision
-      number:</para>
-      
-    <screen>
-$ svn commit --message "Corrected number of cheese slices."
-Sending        sandwich.txt
-Transmitting file data .
-Committed revision 3.
+      <para>The <command>svn import</command> command is a quick way
+        to copy an unversioned tree of files into a repository,
+        creating intermediate directories as necessary.</para>
+
+      <screen>
+$ svnadmin create /usr/local/svn/newrepos
+$ svn import mytree file:///usr/local/svn/newrepos/some/project \
+             -m "Initial import"
+Adding         mytree/foo.c
+Adding         mytree/bar.c
+Adding         mytree/subdir
+Adding         mytree/subdir/quux.h
+Committed revision 1.
 </screen>
 
-    <para>If at any point in the future you want to refer to that
-      revision, you can do so by specifying it as
-      <literal>3</literal>.  We'll discover some reasons why you might
-      want to do that later in this chapter.</para>
-
-    <para>The <command>svn</command> command-line client provides a
-      pair of options for specifying the revisions you wish to operate
-      on.  The most common of these is the <option>--revision</option>
-      (<option>-r</option>), which accepts as a parameter either a
-      single revision specifier (<option>-r
-      <replaceable>REV</replaceable></option>), or a pair of them
-      separated by a colon (<option>-r
-      <replaceable>REV1</replaceable>:<replaceable>REV2</replaceable></option>).
-      This latter format is used to describe a <firstterm>revision
-      range</firstterm>, useful for commands that compare two revision
-      snapshots or operate on every revision between two specified
-      extremes, inclusively.</para>
-
-    <para>Subversion 1.4 introduced a second option for specifying
-      revision ranges, the <option>--change</option>
-      (<option>-c</option>) option.  This is basically just a shortcut
-      for specifying a range of revisions whose boundaries are
-      sequential integers.  In other words, using <option>-c
-      <replaceable>REV</replaceable></option> is the same thing as
-      using <option>-r
-      <replaceable>REV</replaceable>-1:<replaceable>REV</replaceable></option>.
-      And you can trivially reverse the implied range, too, by putting
-      a dash in front of the revision number, as in <option>-c
-      -<replaceable>REV</replaceable></option>.</para>
+      <para>The previous example copied the contents of directory
+        <filename>mytree</filename> under the directory
+        <filename>some/project</filename> in the repository:</para>
+
+      <screen>
+$ svn list file:///usr/local/svn/newrepos/some/project
+bar.c
+foo.c
+subdir/
+</screen>
+
+      <para>Note that after the import is finished, the original tree
+        is <emphasis>not</emphasis> converted into a working copy.  To
+        start working, you still need to <command>svn
+        checkout</command> a fresh working copy of the tree.</para>
+
+    </sect2>
+
+
+
+
+
+
 
   </sect1>
 
@@ -267,6 +268,23 @@
       <literal>subv</literal> instead of a directory named
       <literal>trunk</literal> as we did previously.</para>
 
+
+    <sect2 id="svn.tour.initial.disabling-password-caching">
+      <title>Disabling Password Caching</title>
+  
+      <para>TODO:write this</para>
+
+    </sect2>
+
+
+    <sect2 id="svn.tour.initial.different-user">
+      <title>Authenticating as a Different User</title>
+  
+      <para>TODO:write this</para>
+
+    </sect2>
+
+
   </sect1>
 
   <!-- ================================================================= -->
@@ -314,6 +332,11 @@
 
       <listitem>
         <para>Examine your changes</para>
+
+TODO:            See an overview of your changes
+TODO:            See the details of your local modifications
+
+
         <itemizedlist>
           <listitem>
             <para><command>svn status</command></para>
@@ -321,14 +344,18 @@
           <listitem>
             <para><command>svn diff</command></para>
           </listitem>
-          <listitem>
-            <para><command>svn revert</command></para>
-          </listitem>
         </itemizedlist>
       </listitem>
 
+TODO:        Undoing working changes
+
       <listitem>
-        <para>Merge others' changes into your working copy</para>
+        <para>Resolving Conflicts (Merging Others' Changes)</para>
+
+TODO:            Merging Conflicts by Hand
+TODO:            Copying a File Onto Your Working File
+TODO:            Punting: aborting your changes
+
         <itemizedlist>
           <listitem>
             <para><command>svn update</command></para>
@@ -336,6 +363,9 @@
           <listitem>
             <para><command>svn resolved</command></para>
           </listitem>
+          <listitem>
+            <para><command>svn revert</command></para>
+          </listitem>
         </itemizedlist>
       </listitem>
 
@@ -1604,6 +1634,71 @@
       However, sometimes you just want to <emphasis>peer
       into</emphasis> the past instead of <emphasis>going
       into</emphasis> the past.</para>
+
+
+
+    <!-- =============================================================== -->
+    <sect2 id="todo">
+      <title>Generating a list of historical changes</title>
+      
+      <para>todo</para>
+    </sect2>
+
+
+    <!-- =============================================================== -->
+    <sect2 id="todo">
+      <title>Examining the details of historical changes</title>
+      
+      <para>todo</para>
+    </sect2>
+
+    
+
+      <sect3 id="todo">
+        <title>Examining Local Changes</title>
+        
+        <para>todo</para>
+      </sect3>
+
+
+      <sect3 id="todo">
+        <title>Comparing Working Copy to Repository</title>
+        
+        <para>todo</para>
+      </sect3>
+
+
+      <sect3 id="todo">
+        <title>Comparing Repository to Repository</title>
+        
+        <para>todo</para>
+      </sect3>
+
+
+
+    <!-- =============================================================== -->
+    <sect2 id="todo">
+      <title>Browsing the repository (was 'svn cat' and 'svn list')</title>
+      
+      <para>todo</para>
+    </sect2>
+
+
+    <!-- =============================================================== -->
+    <sect2 id="todo">
+      <title>Fetching older repository snapshots (co, export, update)</title>
+      
+      <para>todo</para>
+    </sect2>
+
+
+
+
+
+
+
+
+
            
     <para>There are several commands that can provide you with
       historical data from the repository:</para>
@@ -2048,43 +2143,6 @@
     </sect2>
 
 
-    <!-- =============================================================== -->
-    <sect2 id="svn.tour.other.import">
-      <title><command>svn import</command></title>
-
-      <para>The <command>svn import</command> command is a quick way
-        to copy an unversioned tree of files into a repository,
-        creating intermediate directories as necessary.</para>
-
-      <screen>
-$ svnadmin create /usr/local/svn/newrepos
-$ svn import mytree file:///usr/local/svn/newrepos/some/project \
-             -m "Initial import"
-Adding         mytree/foo.c
-Adding         mytree/bar.c
-Adding         mytree/subdir
-Adding         mytree/subdir/quux.h
-
-Committed revision 1.
-</screen>
-
-      <para>The previous example copied the contents of directory
-        <filename>mytree</filename> under the directory
-        <filename>some/project</filename> in the repository:</para>
-
-      <screen>
-$ svn list file:///usr/local/svn/newrepos/some/project
-bar.c
-foo.c
-subdir/
-</screen>
-
-      <para>Note that after the import is finished, the original tree
-        is <emphasis>not</emphasis> converted into a working copy.  To
-        start working, you still need to <command>svn
-        checkout</command> a fresh working copy of the tree.</para>
-
-    </sect2>
 
   </sect1>
 




More information about the svnbook-dev mailing list