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

[sussman]

Author: sussman
Date: Sun Jan  6 23:27:06 2008
New Revision: 2959

Log:
* cho04:  fix outdated warning.

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	Sun Jan  6 23:27:06 2008
@@ -2442,12 +2442,7 @@
 
       <para>This situation is best avoided by regularly merging trunk
         changes to the branch.  Make up a policy: once a week, merge
-        the last week's worth of trunk changes to the branch.  Take
-        care when doing this; the merging needs to be hand-tracked to
-        avoid the problem of repeated merges.  You'll need to write
-        careful log messages detailing exactly which revision ranges
-        have been merged already.  It may sound intimidating, but it's
-        actually pretty easy to do.</para>
+        the last week's worth of trunk changes to the branch.</para>
 
       <para>At some point, you'll be ready to merge the
         <quote>synchronized</quote> feature branch back to the trunk.