[svnbook commit] r3114 - trunk/src/en/book

sussman noreply at red-bean.com
Wed Jun 11 14:15:00 CDT 2008


Author: sussman
Date: Wed Jun 11 14:14:59 2008
New Revision: 3114

Log:
* ch04-branching-and-merging.xml:  some corrections from Stefan Sperling <stsp at elego.de>.

Modified:
   trunk/src/en/book/ch04-branching-and-merging.xml

Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml	(original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml	Wed Jun 11 14:14:59 2008
@@ -559,7 +559,7 @@
 
       <screen>
 $ svn status
-M      .
+ M     .
 M      button.c
 M      integer.c
 </screen>
@@ -583,7 +583,8 @@
         no <emphasis>syntactic</emphasis> conflicts doesn't mean there
         aren't any <emphasis>semantic</emphasis> conflicts!)  If you
         encounter serious problems, you can always abort the local
-        changes by running <command>svn revert</command> and start a
+        changes by running <command>svn revert . -R</command> (which
+        will undo all local modifications) and start a
         long <quote>what's going on?</quote> discussion with your
         collaborators.  If things look good, however, then you can
         submit these changes into the repository:</para>
@@ -823,12 +824,13 @@
 
       <para>It is <emphasis>not</emphasis> recommended that you change
         the value of this property yourself, unless you really know
-        what you're doing.  (An example of this comes up in
-        <xref linkend="svn.branchmerge.advanced.blockchanges"/>.)  In
-        general, this property is automatically maintained by
-        Subversion whenever you run <command>svn merge</command>, and
-        its value indicates which changes have already been replicated
-        into a particular directory.</para>
+        what you're doing.  This property is automatically maintained
+        by Subversion whenever you run <command>svn merge</command>.
+        Its value indicates which changes (at a given path) have been
+        replicated into the directory in question.  In this case, the
+        path is <filename>/trunk</filename> and the directory which
+        has received the specific changes
+        is <filename>/branches/my-calc-branch</filename>.</para>
 
       <para>There's also a subcommand <command>svn
         mergeinfo</command>, which can be helpful in seeing not only
@@ -907,10 +909,10 @@
         modifications to your working copy—but we've already
         stressed that you shouldn't be merging into such an
         environment.)  If you don't like the results of the merge,
-        simply <command>svn revert -R</command> the changes from your
-        working copy and retry the command with different options.
-        The merge isn't final until you actually <command>svn
-        commit</command> the results.</para>
+        simply <command>svn revert . -R</command> the changes from
+        your working copy and retry the command with different
+        options.  The merge isn't final until you
+        actually <command>svn commit</command> the results.</para>
 
       <tip>
         <para>While it's perfectly fine to experiment with merges by
@@ -956,6 +958,7 @@
 U    integer.c
 
 $ svn status
+ M     .
 M      integer.c
 
 $ svn diff




More information about the svnbook-dev mailing list