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

[sussman]

Author: sussman
Date: Wed Jun 11 14:38:41 2008
New Revision: 3116

Log:
* ch04-branching-and-merging.xml:  more correctionst from Daniel Shahaf <d.s at daniel.shahaf.co.il>.

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:38:41 2008
@@ -1273,11 +1273,11 @@
 
 $ svn merge http://svn.example.com/repos/calc/trunk
 --- Merging r350 through r354 into '.':
-U    .
+ U   .
 U    integer.c
 U    Makefile
 --- Merging r356 through r360 into '.':
-U    .
+ U   .
 U    integer.c
 U    button.c
 </screen>
@@ -2395,7 +2395,8 @@
 
       <screen>
 $ svn copy http://svn.example.com/repos/calc/branches/my-calc-branch@374 \
-           http://svn.example.com/repos/calc/branches/my-calc-branch
+           http://svn.example.com/repos/calc/branches/my-calc-branch \
+           -m "Restore my-calc-branch."
 
 Committed revision 376.
 </screen>
@@ -2416,8 +2417,8 @@
 
       <screen>
 $ svn copy http://svn.example.com/repos/calc/trunk \
-         http://svn.example.com/repos/calc/branches/stable-1.0 \
-         -m "Creating stable branch of calc project."
+           http://svn.example.com/repos/calc/branches/stable-1.0 \
+          -m "Creating stable branch of calc project."
 
 Committed revision 377.
 </screen>
@@ -2608,7 +2609,9 @@
         changes to the branch.  When that's done, the latest versions
         of branch and trunk will be absolutely identical except for
         your branch changes.  So in this special case, you would merge
-        back with the <option>--reintegrate</option> option:</para>
+        back with the <option>--reintegrate</option> option, being
+        sure to attach a precise peg-revision to the merge's source
+        URL:</para>
 
       <screen>
 $ cd trunk-working-copy
@@ -2622,7 +2625,7 @@
 U    integer.c
 A    newdirectory
 A    newdirectory/newfile
-U    .
+ U   .
 …
 </screen>