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

cmpilato noreply at red-bean.com
Mon Jul 28 23:13:37 CDT 2008


Author: cmpilato
Date: Mon Jul 28 23:13:37 2008
New Revision: 3223

Log:
* src/en/book/ch04-branching-and-merging.xml
  Lose "at the time of writing" phrase, which we agreed long ago to do
  our darnedest to avoid.


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	Mon Jul 28 23:13:37 2008
@@ -795,7 +795,7 @@
         at some point, should you desire (see
         <xref linkend="svn.branchmerge.basicmerging.resurrect"/>).</para>
 
-      <para>At the time of writing (Subversion 1.5), once
+      <para>In Subversion 1.5.0, once
         a <option>--reintegrate</option> merge is done from branch to trunk,
         the branch is no longer usable for further work.  It's not
         able to correctly absorb new trunk changes, nor can it be




More information about the svnbook-dev mailing list