Fossil SCM
Fix incorrect check-in numbers (referring to Figure 5) in the branching tutorial
Commit
5e4b1632bc0d803d04e200bd29c37085ad16bc39
Parent
5c65487c5f5cfc8…
1 file changed
+2
-2
+2
-2
| --- www/branching.wiki | ||
| +++ www/branching.wiki | ||
| @@ -199,18 +199,18 @@ | ||
| 199 | 199 | "trunk" branch and to have the symbolic name "trunk". |
| 200 | 200 | |
| 201 | 201 | Check-in 4 has a <b>branch</b> tag which changes the name of the branch |
| 202 | 202 | to "test". The branch tag on check-in 4 propagates to check-ins 6 and 9. |
| 203 | 203 | But because tag propagation does not follow merge links, the <b>branch=test</b> |
| 204 | -tag does not propagate to check-ins 7, 8, or 9. Note also that the | |
| 204 | +tag does not propagate to check-ins 7, 8, or 10. Note also that the | |
| 205 | 205 | <b>branch</b> tag on check-in 4 blocks the propagation of <b>branch=trunk</b> |
| 206 | 206 | so that it cannot reach check-ins 6 or 9. This causes check-ins 4, 6, and |
| 207 | 207 | 9 to be in the "test" branch and all others to be in the "trunk" branch. |
| 208 | 208 | |
| 209 | 209 | Check-in 4 also has a <b>sym-test</b> tag, which gives the symbolic name |
| 210 | 210 | "test" to check-ins 4, 6, and 9. Because tags do not propagate across |
| 211 | -merges, check-ins 7, 8, and 9 do not inherit the <b>sym-test</b> tag and | |
| 211 | +merges, check-ins 7, 8, and 10 do not inherit the <b>sym-test</b> tag and | |
| 212 | 212 | are hence not known by the name "test". |
| 213 | 213 | To prevent the <b>sym-trunk</b> tag from propagating from check-in 1 |
| 214 | 214 | into check-ins 4, 6, and 9, there is a cancellation tag for |
| 215 | 215 | <b>sym-trunk</b> on check-in 4. The net effect of all of this is that |
| 216 | 216 | check-ins on the trunk go by the symbolic name of "trunk" and check-ins |
| 217 | 217 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -199,18 +199,18 @@ | |
| 199 | "trunk" branch and to have the symbolic name "trunk". |
| 200 | |
| 201 | Check-in 4 has a <b>branch</b> tag which changes the name of the branch |
| 202 | to "test". The branch tag on check-in 4 propagates to check-ins 6 and 9. |
| 203 | But because tag propagation does not follow merge links, the <b>branch=test</b> |
| 204 | tag does not propagate to check-ins 7, 8, or 9. Note also that the |
| 205 | <b>branch</b> tag on check-in 4 blocks the propagation of <b>branch=trunk</b> |
| 206 | so that it cannot reach check-ins 6 or 9. This causes check-ins 4, 6, and |
| 207 | 9 to be in the "test" branch and all others to be in the "trunk" branch. |
| 208 | |
| 209 | Check-in 4 also has a <b>sym-test</b> tag, which gives the symbolic name |
| 210 | "test" to check-ins 4, 6, and 9. Because tags do not propagate across |
| 211 | merges, check-ins 7, 8, and 9 do not inherit the <b>sym-test</b> tag and |
| 212 | are hence not known by the name "test". |
| 213 | To prevent the <b>sym-trunk</b> tag from propagating from check-in 1 |
| 214 | into check-ins 4, 6, and 9, there is a cancellation tag for |
| 215 | <b>sym-trunk</b> on check-in 4. The net effect of all of this is that |
| 216 | check-ins on the trunk go by the symbolic name of "trunk" and check-ins |
| 217 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -199,18 +199,18 @@ | |
| 199 | "trunk" branch and to have the symbolic name "trunk". |
| 200 | |
| 201 | Check-in 4 has a <b>branch</b> tag which changes the name of the branch |
| 202 | to "test". The branch tag on check-in 4 propagates to check-ins 6 and 9. |
| 203 | But because tag propagation does not follow merge links, the <b>branch=test</b> |
| 204 | tag does not propagate to check-ins 7, 8, or 10. Note also that the |
| 205 | <b>branch</b> tag on check-in 4 blocks the propagation of <b>branch=trunk</b> |
| 206 | so that it cannot reach check-ins 6 or 9. This causes check-ins 4, 6, and |
| 207 | 9 to be in the "test" branch and all others to be in the "trunk" branch. |
| 208 | |
| 209 | Check-in 4 also has a <b>sym-test</b> tag, which gives the symbolic name |
| 210 | "test" to check-ins 4, 6, and 9. Because tags do not propagate across |
| 211 | merges, check-ins 7, 8, and 10 do not inherit the <b>sym-test</b> tag and |
| 212 | are hence not known by the name "test". |
| 213 | To prevent the <b>sym-trunk</b> tag from propagating from check-in 1 |
| 214 | into check-ins 4, 6, and 9, there is a cancellation tag for |
| 215 | <b>sym-trunk</b> on check-in 4. The net effect of all of this is that |
| 216 | check-ins on the trunk go by the symbolic name of "trunk" and check-ins |
| 217 |