r5238 - in trunk/editor-manual: chapter01 chapter03

matthew at linuxfromscratch.org matthew at linuxfromscratch.org
Sun May 8 09:46:21 PDT 2005


Author: matthew
Date: 2005-05-08 10:46:21 -0600 (Sun, 08 May 2005)
New Revision: 5238

Modified:
   trunk/editor-manual/chapter01/changelog.xml
   trunk/editor-manual/chapter03/update.xml
Log:
Minor wording and tagging improvements

Modified: trunk/editor-manual/chapter01/changelog.xml
===================================================================
--- trunk/editor-manual/chapter01/changelog.xml	2005-05-08 16:30:52 UTC (rev 5237)
+++ trunk/editor-manual/chapter01/changelog.xml	2005-05-08 16:46:21 UTC (rev 5238)
@@ -29,6 +29,7 @@
  <listitem><para>Changelog Entries:</para>
 
   <itemizedlist>
+   <listitem><para>May 8, 2005 [matt]: chapter03/update.xml: Minor wording and tagging improvements</para></listitem>
    <listitem><para>May 8, 2005 [matt]: chapter03/checkout.xml: Minor wording and tagging improvements</para></listitem>
    <listitem><para>May 8, 2005 [matt]: chapter03/introduction.xml: Minor wording and tagging improvements</para></listitem>
    <listitem><para>May 8, 2005 [matt]: chapter02/svnssh.xml: Minor wording and tagging improvements</para></listitem>

Modified: trunk/editor-manual/chapter03/update.xml
===================================================================
--- trunk/editor-manual/chapter03/update.xml	2005-05-08 16:30:52 UTC (rev 5237)
+++ trunk/editor-manual/chapter03/update.xml	2005-05-08 16:46:21 UTC (rev 5238)
@@ -9,13 +9,18 @@
   <?dbhtml filename="update.html"?>
 
   <para><userinput>svn update</userinput> or <userinput>svn up</userinput>.
-    This command syncs your local working copy with the server and is probably, along
-    with <userinput>svn commit</userinput> the command you will use most
-    frequently. If you have made local changes, it'll try and merge any changes
-    on the server with your changes <emphasis>on your machine</emphasis>. You
-    should always do a manual <userinput>svn update</userinput> before trying to
-    commit changes in order to check that everything is alright and ready to go
-    (although when you do a <userinput>svn commit</userinput>, it will warn you
-    if there is a problem).
+    This command synchorinses your local working copy with the server and is
+    probably, along with <userinput>svn commit</userinput> the command you will
+    use most frequently. If you have made local changes, Subversion will try to
+    merge any changes on the server with the changes you have made <emphasis>on
+    your machine</emphasis>.
   </para>
+
+  <para>You should always do a manual <command>svn <option>update</option>
+    </command> before trying to commit changes in order to ensure that there are
+    no conflicts with changes that have been made since you started your work.
+    Note that <command>svn <option>commit</option></command> will warn you if
+    there is a conflict, in case you forget to perform an <command>svn
+    <option>update</option></command>.
+  </para>
 </sect1>




More information about the lfs-book mailing list