[svnbook] r4143 committed - Update some text which implies 1.6 is the most recent version....
svnbook at googlecode.com
svnbook at googlecode.com
Thu Nov 3 14:12:32 CDT 2011
Revision: 4143
Author: ptburba at gmail.com
Date: Thu Nov 3 12:11:16 2011
Log: Update some text which implies 1.6 is the most recent version.
* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.cherrypicking,
(svn.branchmerge.advanced.blockchanges):
* en/book/ch05-repository-admin.xml
(svn.reposadmin.basics.backends.fsfs.revfiles,
svn.reposadmin.maint.diskspace.fsfspacking):
Like it says at the top.
http://code.google.com/p/svnbook/source/detail?r=4143
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
/trunk/en/book/ch05-repository-admin.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Thu Nov 3 10:47:23 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Thu Nov 3 12:11:16 2011
@@ -1676,7 +1676,7 @@
changes. If you postpone a conflict from the first wave of
changes, the whole merge command will bail out with an error
message.<footnote><para>At least, this is true in Subversion
- 1.6 at the time of this writing. This behavior may improve
+ 1.7 at the time of this writing. This behavior may improve
in future versions of Subversion.</para></footnote></para>
</warning>
@@ -2079,8 +2079,8 @@
out, that is, prevent them from ever being automatically
merged.</para>
- <para>In Subversion 1.6, the only way to block a changeset is to
- make the system believe that the change has
+ <para>Through Subversion 1.7, the only way to block a changeset
+ is to make the system believe that the change has
<emphasis>already</emphasis> been merged. To do this, invoke
a merge command with the <option>--record-only</option>
option:</para>
=======================================
--- /trunk/en/book/ch05-repository-admin.xml Thu Sep 8 13:39:19 2011
+++ /trunk/en/book/ch05-repository-admin.xml Thu Nov 3 12:11:16 2011
@@ -721,8 +721,8 @@
performance of Subversion when reading from the
repository.</para>
- <para>Subversion 1.6 takes the sharded layout one step
- further, allowing administrators to
+ <para>Subversion 1.6 and later takes the sharded layout one
+ step further, allowing administrators to
optionally <firstterm>pack</firstterm> each of their
repository shards up into a single multi-revision file.
This can have both performance and disk usage benefits.
@@ -1819,7 +1819,7 @@
paid.</para>
<para>Subversion can pack existing sharded repositories which
- have been upgraded to the 1.6 filesystem format (see
+ have been upgraded to the 1.6 filesystem format or later (see
<xref linkend="svn.ref.svnadmin.c.upgrade"/>). To do so,
just run <command>svnadmin pack</command> on the
repository:</para>
More information about the svnbook-dev
mailing list