Fossil SCM
Moved the comment about patch files in fossil-v-git down to a footnote and expanded on the point. It isn't a Git vs Fossil difference, but we need to explain why "just use a patch file" isn't a good answer to the common "allow easy drive-by contributions" wish.
Commit
4dcbd09feae9c12ac7c8e65311f77611073ad3d4166ae633215a4a348b4eae72
Parent
3c602dd7f38045c…
1 file changed
+11
-4
+11
-4
| --- www/fossil-v-git.wiki | ||
| +++ www/fossil-v-git.wiki | ||
| @@ -13,11 +13,11 @@ | ||
| 13 | 13 | Keep in mind that you are reading this on a Fossil website, and though |
| 14 | 14 | we try to be fair, the information here |
| 15 | 15 | might be biased in favor of Fossil. Ask around for second opinions from |
| 16 | 16 | people who have used <em>both</em> Fossil and Git. |
| 17 | 17 | |
| 18 | -¹<small><i>Git does not include a | |
| 18 | +¹ <small><i>Git does not include a | |
| 19 | 19 | wiki, a ticket tracker, a forum, or a tech-note feature, so those elements will not transfer when |
| 20 | 20 | exporting from Fossil to Git. GitHub adds some of these to stock Git, |
| 21 | 21 | but because they're not part of Git proper, [./mirrortogithub.md|exporting a Fossil |
| 22 | 22 | repository to GitHub] will still not include them; Fossil tickets do not |
| 23 | 23 | become GitHub issues, for example.</i></small> |
| @@ -193,13 +193,11 @@ | ||
| 193 | 193 | |
| 194 | 194 | <li><p><b>Anonymous contribution discouraged:</b> Anonymous |
| 195 | 195 | contribution is possible in a Fossil project, but there is no |
| 196 | 196 | low-friction path to it, as in Git. Fossil's closest equivalent to |
| 197 | 197 | Git pull requests is the [/help?cmd=bundle|bundle], which requires |
| 198 | - higher engagement than firing off a PR. Both Fossil and Git also | |
| 199 | - support <tt>patch(1)</tt> files, but that's a lossy contribution | |
| 200 | - path in both systems.</p></li> | |
| 198 | + higher engagement than firing off a PR.²</p></li> | |
| 201 | 199 | |
| 202 | 200 | <li><p><b>No rebasing:</b> When a remote clone syncs changes up to |
| 203 | 201 | its parent repository, the changes are sent exactly as they were |
| 204 | 202 | committed to the local repository. [#history|There is no rebasing |
| 205 | 203 | mechanism, on purpose.]</p></li> |
| @@ -236,10 +234,19 @@ | ||
| 236 | 234 | — can maintain a better mental picture of what is happening, leading to |
| 237 | 235 | better situational awareness. |
| 238 | 236 | |
| 239 | 237 | Each DVCS can be used in the opposite style, but doing so works against |
| 240 | 238 | their low-friction paths. |
| 239 | + | |
| 240 | +² <small><i>Both Fossil and Git support | |
| 241 | +[https://en.wikipedia.org/wiki/Patch_(Unix)|<tt>patch(1)</tt> files], | |
| 242 | +which is a common way to allow drive-by contributions, but it's a lossy | |
| 243 | +contribution path for both systems. Unlike Git PRs and Fossil bundles, | |
| 244 | +patches collapse mulitple checkins together, they don't include check-in | |
| 245 | +comments, and the cannot encode changes made above the individual file | |
| 246 | +content layer: branching decisisions, tag changes, file renames, file | |
| 247 | +deletions, etc.</small> | |
| 241 | 248 | |
| 242 | 249 | |
| 243 | 250 | <h4 id="scale">2.3.2 Scale</h4> |
| 244 | 251 | |
| 245 | 252 | The Linux kernel has a far bigger developer community than that of |
| 246 | 253 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -13,11 +13,11 @@ | |
| 13 | Keep in mind that you are reading this on a Fossil website, and though |
| 14 | we try to be fair, the information here |
| 15 | might be biased in favor of Fossil. Ask around for second opinions from |
| 16 | people who have used <em>both</em> Fossil and Git. |
| 17 | |
| 18 | ¹<small><i>Git does not include a |
| 19 | wiki, a ticket tracker, a forum, or a tech-note feature, so those elements will not transfer when |
| 20 | exporting from Fossil to Git. GitHub adds some of these to stock Git, |
| 21 | but because they're not part of Git proper, [./mirrortogithub.md|exporting a Fossil |
| 22 | repository to GitHub] will still not include them; Fossil tickets do not |
| 23 | become GitHub issues, for example.</i></small> |
| @@ -193,13 +193,11 @@ | |
| 193 | |
| 194 | <li><p><b>Anonymous contribution discouraged:</b> Anonymous |
| 195 | contribution is possible in a Fossil project, but there is no |
| 196 | low-friction path to it, as in Git. Fossil's closest equivalent to |
| 197 | Git pull requests is the [/help?cmd=bundle|bundle], which requires |
| 198 | higher engagement than firing off a PR. Both Fossil and Git also |
| 199 | support <tt>patch(1)</tt> files, but that's a lossy contribution |
| 200 | path in both systems.</p></li> |
| 201 | |
| 202 | <li><p><b>No rebasing:</b> When a remote clone syncs changes up to |
| 203 | its parent repository, the changes are sent exactly as they were |
| 204 | committed to the local repository. [#history|There is no rebasing |
| 205 | mechanism, on purpose.]</p></li> |
| @@ -236,10 +234,19 @@ | |
| 236 | — can maintain a better mental picture of what is happening, leading to |
| 237 | better situational awareness. |
| 238 | |
| 239 | Each DVCS can be used in the opposite style, but doing so works against |
| 240 | their low-friction paths. |
| 241 | |
| 242 | |
| 243 | <h4 id="scale">2.3.2 Scale</h4> |
| 244 | |
| 245 | The Linux kernel has a far bigger developer community than that of |
| 246 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -13,11 +13,11 @@ | |
| 13 | Keep in mind that you are reading this on a Fossil website, and though |
| 14 | we try to be fair, the information here |
| 15 | might be biased in favor of Fossil. Ask around for second opinions from |
| 16 | people who have used <em>both</em> Fossil and Git. |
| 17 | |
| 18 | ¹ <small><i>Git does not include a |
| 19 | wiki, a ticket tracker, a forum, or a tech-note feature, so those elements will not transfer when |
| 20 | exporting from Fossil to Git. GitHub adds some of these to stock Git, |
| 21 | but because they're not part of Git proper, [./mirrortogithub.md|exporting a Fossil |
| 22 | repository to GitHub] will still not include them; Fossil tickets do not |
| 23 | become GitHub issues, for example.</i></small> |
| @@ -193,13 +193,11 @@ | |
| 193 | |
| 194 | <li><p><b>Anonymous contribution discouraged:</b> Anonymous |
| 195 | contribution is possible in a Fossil project, but there is no |
| 196 | low-friction path to it, as in Git. Fossil's closest equivalent to |
| 197 | Git pull requests is the [/help?cmd=bundle|bundle], which requires |
| 198 | higher engagement than firing off a PR.²</p></li> |
| 199 | |
| 200 | <li><p><b>No rebasing:</b> When a remote clone syncs changes up to |
| 201 | its parent repository, the changes are sent exactly as they were |
| 202 | committed to the local repository. [#history|There is no rebasing |
| 203 | mechanism, on purpose.]</p></li> |
| @@ -236,10 +234,19 @@ | |
| 234 | — can maintain a better mental picture of what is happening, leading to |
| 235 | better situational awareness. |
| 236 | |
| 237 | Each DVCS can be used in the opposite style, but doing so works against |
| 238 | their low-friction paths. |
| 239 | |
| 240 | ² <small><i>Both Fossil and Git support |
| 241 | [https://en.wikipedia.org/wiki/Patch_(Unix)|<tt>patch(1)</tt> files], |
| 242 | which is a common way to allow drive-by contributions, but it's a lossy |
| 243 | contribution path for both systems. Unlike Git PRs and Fossil bundles, |
| 244 | patches collapse mulitple checkins together, they don't include check-in |
| 245 | comments, and the cannot encode changes made above the individual file |
| 246 | content layer: branching decisisions, tag changes, file renames, file |
| 247 | deletions, etc.</small> |
| 248 | |
| 249 | |
| 250 | <h4 id="scale">2.3.2 Scale</h4> |
| 251 | |
| 252 | The Linux kernel has a far bigger developer community than that of |
| 253 |