Differences From:

File www/branching.wiki part of check-in [766bec08ce] - Documentation tweaks. Change the "Setup" menu title to "Admin". Added pages under Admin to view the RCVFROM table of the database. by drh on 2009-01-25 19:18:09. [view]

To:

File www/branching.wiki part of check-in [5e4b1632bc] - Fix incorrect check-in numbers (referring to Figure 5) in the branching tutorial by eric on 2009-01-26 19:41:49. [view]

@@ -200,16 +200,16 @@
 
 Check-in 4 has a <b>branch</b> tag which changes the name of the branch
 to "test".  The branch tag on check-in 4 propagates to check-ins 6 and 9.
 But because tag propagation does not follow merge links, the <b>branch=test</b>
-tag does not propagate to check-ins 7, 8, or 9.  Note also that the
+tag does not propagate to check-ins 7, 8, or 10.  Note also that the
 <b>branch</b> tag on check-in 4 blocks the propagation of <b>branch=trunk</b>
 so that it cannot reach check-ins 6 or 9.  This causes check-ins 4, 6, and
 9 to be in the "test" branch and all others to be in the "trunk" branch.
 
 Check-in 4 also has a <b>sym-test</b> tag, which gives the symbolic name
 "test" to check-ins 4, 6, and 9.  Because tags do not propagate across
-merges, check-ins 7, 8, and 9 do not inherit the <b>sym-test</b> tag and
+merges, check-ins 7, 8, and 10 do not inherit the <b>sym-test</b> tag and
 are hence not known by the name "test".
 To prevent the <b>sym-trunk</b> tag from propagating from check-in 1
 into check-ins 4, 6, and 9, there is a cancellation tag for
 <b>sym-trunk</b> on check-in 4.  The net effect of all of this is that