Fossil SCM
Minor correction to embedded document link to include relative path.
Commit
c11f57fa489e1b4a9a0feb2a524d3493a1f642c4
Parent
b2a8924eb28f962…
1 file changed
+1
-1
+1
-1
| --- www/branching.wiki | ||
| +++ www/branching.wiki | ||
| @@ -56,11 +56,11 @@ | ||
| 56 | 56 | a leaf. Fossil sees that check-in 3 has occurred and aborts Bob's commit |
| 57 | 57 | attempt with a message "would fork." This allows Bob to do a "fossil |
| 58 | 58 | update" which pulls in Alice's changes, merging them into his own |
| 59 | 59 | changes. After merging, Bob commits check-in 4 as a child of check-in 3. |
| 60 | 60 | The result is a linear graph as shown in figure 1. This is how CVS |
| 61 | -works. This is also how fossil works in [concepts.wiki#workflow | | |
| 61 | +works. This is also how fossil works in [./concepts.wiki#workflow | | |
| 62 | 62 | "autosync"] mode. |
| 63 | 63 | |
| 64 | 64 | But perhaps Bob is off-network when he does his commit, so he |
| 65 | 65 | has no way of knowing that Alice has already committed her changes. |
| 66 | 66 | Or, it could be that Bob has turned off "autosync" mode in Fossil. Or, |
| 67 | 67 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -56,11 +56,11 @@ | |
| 56 | a leaf. Fossil sees that check-in 3 has occurred and aborts Bob's commit |
| 57 | attempt with a message "would fork." This allows Bob to do a "fossil |
| 58 | update" which pulls in Alice's changes, merging them into his own |
| 59 | changes. After merging, Bob commits check-in 4 as a child of check-in 3. |
| 60 | The result is a linear graph as shown in figure 1. This is how CVS |
| 61 | works. This is also how fossil works in [concepts.wiki#workflow | |
| 62 | "autosync"] mode. |
| 63 | |
| 64 | But perhaps Bob is off-network when he does his commit, so he |
| 65 | has no way of knowing that Alice has already committed her changes. |
| 66 | Or, it could be that Bob has turned off "autosync" mode in Fossil. Or, |
| 67 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -56,11 +56,11 @@ | |
| 56 | a leaf. Fossil sees that check-in 3 has occurred and aborts Bob's commit |
| 57 | attempt with a message "would fork." This allows Bob to do a "fossil |
| 58 | update" which pulls in Alice's changes, merging them into his own |
| 59 | changes. After merging, Bob commits check-in 4 as a child of check-in 3. |
| 60 | The result is a linear graph as shown in figure 1. This is how CVS |
| 61 | works. This is also how fossil works in [./concepts.wiki#workflow | |
| 62 | "autosync"] mode. |
| 63 | |
| 64 | But perhaps Bob is off-network when he does his commit, so he |
| 65 | has no way of knowing that Alice has already committed her changes. |
| 66 | Or, it could be that Bob has turned off "autosync" mode in Fossil. Or, |
| 67 |