Fossil SCM
Documentation update: Back out the claim that Git uses multiple DAGs because I now believe that claim is incorrect.
Commit
24c33b00f2a9e32466ecfd5e9ca45c25d79f9578
Parent
88f2715f3608733…
1 file changed
+1
-11
+1
-11
| --- www/fossil-v-git.wiki | ||
| +++ www/fossil-v-git.wiki | ||
| @@ -25,12 +25,10 @@ | ||
| 25 | 25 | <tr><td>Complex</td><td>Intuitive</td></tr> |
| 26 | 26 | <tr><td>Separate web tools</td><td>Integrated Web interface</td></tr> |
| 27 | 27 | <tr><td>Lots of little tools</td><td>Single executable</td></tr> |
| 28 | 28 | <tr><td>Pile-of-files repository</td><td>Single file repository</td></tr> |
| 29 | 29 | <tr><td>Uses "<tt>rebase</tt>"</td><td>Immutable</td></tr> |
| 30 | -<tr><td>Multiple [./branching.wiki#dag | DAGs]; one per branch</td> | |
| 31 | - <td>All branches on one [./branching.wiki#dag | DAG]</td></tr> | |
| 32 | 30 | <tr><td>GPL</td><td>BSD</td></tr> |
| 33 | 31 | </table></center></blockquote> |
| 34 | 32 | |
| 35 | 33 | <h2>3.0 Discussion</h2> |
| 36 | 34 | |
| @@ -192,22 +190,14 @@ | ||
| 192 | 190 | by entering a correction, with an explanation of why the correction is |
| 193 | 191 | needed. This can make the history of a project messy, but it also |
| 194 | 192 | makes it more honest. The lack of a "rebase" function is considered |
| 195 | 193 | a feature of Fossil, not a bug. |
| 196 | 194 | |
| 197 | -<h3>3.9 Single DAG</h3> | |
| 198 | - | |
| 199 | -Git maintains a separate directed acyclic graph (DAG) for each branch | |
| 200 | -of a repository. Fossil maintains a single DAG for all branches. In | |
| 201 | -Git, the branch that a specific check-in belongs to is determined by | |
| 202 | -which DAG it is part of. In Fossil, the branch of a check-in is determined | |
| 203 | -by [./branching.wiki#tags | tags and properties] attached to the check-in. | |
| 204 | - | |
| 205 | -<h3>3.10 License</h3> | |
| 195 | +<h3>3.9 License</h3> | |
| 206 | 196 | |
| 207 | 197 | Both Git and Fossil are open-source. Git is under |
| 208 | 198 | [http://www.gnu.org/licenses/gpl.html | GPL] whereas Fossil is |
| 209 | 199 | under the |
| 210 | 200 | [http://en.wikipedia.org/wiki/BSD_licenses | two-clause BSD license]. |
| 211 | 201 | The difference should not be of a concern to most users. However, |
| 212 | 202 | some corporate lawyers have objections to using GPL products and |
| 213 | 203 | are more comfortable with a BSD-style license. |
| 214 | 204 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -25,12 +25,10 @@ | |
| 25 | <tr><td>Complex</td><td>Intuitive</td></tr> |
| 26 | <tr><td>Separate web tools</td><td>Integrated Web interface</td></tr> |
| 27 | <tr><td>Lots of little tools</td><td>Single executable</td></tr> |
| 28 | <tr><td>Pile-of-files repository</td><td>Single file repository</td></tr> |
| 29 | <tr><td>Uses "<tt>rebase</tt>"</td><td>Immutable</td></tr> |
| 30 | <tr><td>Multiple [./branching.wiki#dag | DAGs]; one per branch</td> |
| 31 | <td>All branches on one [./branching.wiki#dag | DAG]</td></tr> |
| 32 | <tr><td>GPL</td><td>BSD</td></tr> |
| 33 | </table></center></blockquote> |
| 34 | |
| 35 | <h2>3.0 Discussion</h2> |
| 36 | |
| @@ -192,22 +190,14 @@ | |
| 192 | by entering a correction, with an explanation of why the correction is |
| 193 | needed. This can make the history of a project messy, but it also |
| 194 | makes it more honest. The lack of a "rebase" function is considered |
| 195 | a feature of Fossil, not a bug. |
| 196 | |
| 197 | <h3>3.9 Single DAG</h3> |
| 198 | |
| 199 | Git maintains a separate directed acyclic graph (DAG) for each branch |
| 200 | of a repository. Fossil maintains a single DAG for all branches. In |
| 201 | Git, the branch that a specific check-in belongs to is determined by |
| 202 | which DAG it is part of. In Fossil, the branch of a check-in is determined |
| 203 | by [./branching.wiki#tags | tags and properties] attached to the check-in. |
| 204 | |
| 205 | <h3>3.10 License</h3> |
| 206 | |
| 207 | Both Git and Fossil are open-source. Git is under |
| 208 | [http://www.gnu.org/licenses/gpl.html | GPL] whereas Fossil is |
| 209 | under the |
| 210 | [http://en.wikipedia.org/wiki/BSD_licenses | two-clause BSD license]. |
| 211 | The difference should not be of a concern to most users. However, |
| 212 | some corporate lawyers have objections to using GPL products and |
| 213 | are more comfortable with a BSD-style license. |
| 214 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -25,12 +25,10 @@ | |
| 25 | <tr><td>Complex</td><td>Intuitive</td></tr> |
| 26 | <tr><td>Separate web tools</td><td>Integrated Web interface</td></tr> |
| 27 | <tr><td>Lots of little tools</td><td>Single executable</td></tr> |
| 28 | <tr><td>Pile-of-files repository</td><td>Single file repository</td></tr> |
| 29 | <tr><td>Uses "<tt>rebase</tt>"</td><td>Immutable</td></tr> |
| 30 | <tr><td>GPL</td><td>BSD</td></tr> |
| 31 | </table></center></blockquote> |
| 32 | |
| 33 | <h2>3.0 Discussion</h2> |
| 34 | |
| @@ -192,22 +190,14 @@ | |
| 190 | by entering a correction, with an explanation of why the correction is |
| 191 | needed. This can make the history of a project messy, but it also |
| 192 | makes it more honest. The lack of a "rebase" function is considered |
| 193 | a feature of Fossil, not a bug. |
| 194 | |
| 195 | <h3>3.9 License</h3> |
| 196 | |
| 197 | Both Git and Fossil are open-source. Git is under |
| 198 | [http://www.gnu.org/licenses/gpl.html | GPL] whereas Fossil is |
| 199 | under the |
| 200 | [http://en.wikipedia.org/wiki/BSD_licenses | two-clause BSD license]. |
| 201 | The difference should not be of a concern to most users. However, |
| 202 | some corporate lawyers have objections to using GPL products and |
| 203 | are more comfortable with a BSD-style license. |
| 204 |