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

[sussman]

Author: sussman
Date: Wed Jun 11 15:47:00 2008
New Revision: 3118

Log:
* ch04-branching-and-merging.xml:  remove extra pegrev from third --reintegrate example.

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 15:47:00 2008
@@ -2608,10 +2608,8 @@
         To do this, begin by doing a final merge of the latest trunk
         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, being
-        sure to attach a precise peg-revision to the merge's source
-        URL:</para>
+        your branch changes.  You would then merge back with
+        the <option>--reintegrate</option> option:</para>
 
       <screen>
 $ cd trunk-working-copy
@@ -2619,7 +2617,7 @@
 $ svn update
 At revision 1910.
 
-$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/mybranch@1910
+$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/mybranch
 --- Merging differences between repository URLs into '.':
 U    real.c
 U    integer.c