Fossil SCM
Record Olorin's disputes with the fossil-v-git document. Also fix a stale table-of-contents link in that same document.
Commit
b08f062316aa5517f905e18fde19291c47de15c8751f28b4aab1e745710be0fc
Parent
ab54928db765a55…
1 file changed
+6
-6
+6
-6
| --- www/fossil-v-git.wiki | ||
| +++ www/fossil-v-git.wiki | ||
| @@ -70,18 +70,13 @@ | ||
| 70 | 70 | <td>Designed for Linux kernel development</td> |
| 71 | 71 | <td>Designed for SQLite development</td> |
| 72 | 72 | <td><a href="#scale">2.5.2 ↓</a></td> |
| 73 | 73 | </tr> |
| 74 | 74 | <tr> |
| 75 | - <td>Many contributors</td> | |
| 76 | - <td>Select contributors</td> | |
| 77 | - <td><a href="#contrib">2.5.3 ↓</a></td> | |
| 78 | -</tr> | |
| 79 | -<tr> | |
| 80 | 75 | <td>Focus on individual branches</td> |
| 81 | 76 | <td>Focus on the entire tree of changes</td> |
| 82 | - <td><a href="#branches">2.5.4 ↓</a></td> | |
| 77 | + <td><a href="#branches">2.5.3 ↓</a></td> | |
| 83 | 78 | </tr> |
| 84 | 79 | <tr> |
| 85 | 80 | <td>One check-out per repository</td> |
| 86 | 81 | <td>Many check-outs per repository</td> |
| 87 | 82 | <td><a href="#checkouts">2.6 ↓</a></td> |
| @@ -591,10 +586,13 @@ | ||
| 591 | 586 | and its handful of active committers. Seeing all |
| 592 | 587 | changes on all branches all at once helps keep the whole team |
| 593 | 588 | up-to-date with what everybody else is doing, resulting in a more |
| 594 | 589 | tightly focused and cohesive implementation. |
| 595 | 590 | |
| 591 | +Parts of this section are [https://fossil-scm.org/forum/forumpost/5961e969fa|disputed] | |
| 592 | +by [https://github.com/olorin37|Jakub A. G.]. | |
| 593 | + | |
| 596 | 594 | |
| 597 | 595 | <h3 id="checkouts">2.6 One vs. Many Check-outs per Repository</h3> |
| 598 | 596 | |
| 599 | 597 | Because Git commingles the repository data with the initial checkout of |
| 600 | 598 | that repository, the default mode of operation in Git is to stick to that |
| @@ -660,10 +658,12 @@ | ||
| 660 | 658 | |
| 661 | 659 | Plus, |
| 662 | 660 | <tt>cd</tt> is faster to type than <tt>git checkout</tt> or <tt>fossil |
| 663 | 661 | update</tt>. |
| 664 | 662 | |
| 663 | +Parts of this section are [https://fossil-scm.org/forum/forumpost/5961e969fa|disputed] | |
| 664 | +by [https://github.com/olorin37|Jakub A. G.]. | |
| 665 | 665 | |
| 666 | 666 | <h3 id="history">2.7 What you should have done vs. What you actually did</h3> |
| 667 | 667 | |
| 668 | 668 | Git puts a lot of emphasis on maintaining |
| 669 | 669 | a "clean" check-in history. Extraneous and experimental branches by |
| 670 | 670 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -70,18 +70,13 @@ | |
| 70 | <td>Designed for Linux kernel development</td> |
| 71 | <td>Designed for SQLite development</td> |
| 72 | <td><a href="#scale">2.5.2 ↓</a></td> |
| 73 | </tr> |
| 74 | <tr> |
| 75 | <td>Many contributors</td> |
| 76 | <td>Select contributors</td> |
| 77 | <td><a href="#contrib">2.5.3 ↓</a></td> |
| 78 | </tr> |
| 79 | <tr> |
| 80 | <td>Focus on individual branches</td> |
| 81 | <td>Focus on the entire tree of changes</td> |
| 82 | <td><a href="#branches">2.5.4 ↓</a></td> |
| 83 | </tr> |
| 84 | <tr> |
| 85 | <td>One check-out per repository</td> |
| 86 | <td>Many check-outs per repository</td> |
| 87 | <td><a href="#checkouts">2.6 ↓</a></td> |
| @@ -591,10 +586,13 @@ | |
| 591 | and its handful of active committers. Seeing all |
| 592 | changes on all branches all at once helps keep the whole team |
| 593 | up-to-date with what everybody else is doing, resulting in a more |
| 594 | tightly focused and cohesive implementation. |
| 595 | |
| 596 | |
| 597 | <h3 id="checkouts">2.6 One vs. Many Check-outs per Repository</h3> |
| 598 | |
| 599 | Because Git commingles the repository data with the initial checkout of |
| 600 | that repository, the default mode of operation in Git is to stick to that |
| @@ -660,10 +658,12 @@ | |
| 660 | |
| 661 | Plus, |
| 662 | <tt>cd</tt> is faster to type than <tt>git checkout</tt> or <tt>fossil |
| 663 | update</tt>. |
| 664 | |
| 665 | |
| 666 | <h3 id="history">2.7 What you should have done vs. What you actually did</h3> |
| 667 | |
| 668 | Git puts a lot of emphasis on maintaining |
| 669 | a "clean" check-in history. Extraneous and experimental branches by |
| 670 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -70,18 +70,13 @@ | |
| 70 | <td>Designed for Linux kernel development</td> |
| 71 | <td>Designed for SQLite development</td> |
| 72 | <td><a href="#scale">2.5.2 ↓</a></td> |
| 73 | </tr> |
| 74 | <tr> |
| 75 | <td>Focus on individual branches</td> |
| 76 | <td>Focus on the entire tree of changes</td> |
| 77 | <td><a href="#branches">2.5.3 ↓</a></td> |
| 78 | </tr> |
| 79 | <tr> |
| 80 | <td>One check-out per repository</td> |
| 81 | <td>Many check-outs per repository</td> |
| 82 | <td><a href="#checkouts">2.6 ↓</a></td> |
| @@ -591,10 +586,13 @@ | |
| 586 | and its handful of active committers. Seeing all |
| 587 | changes on all branches all at once helps keep the whole team |
| 588 | up-to-date with what everybody else is doing, resulting in a more |
| 589 | tightly focused and cohesive implementation. |
| 590 | |
| 591 | Parts of this section are [https://fossil-scm.org/forum/forumpost/5961e969fa|disputed] |
| 592 | by [https://github.com/olorin37|Jakub A. G.]. |
| 593 | |
| 594 | |
| 595 | <h3 id="checkouts">2.6 One vs. Many Check-outs per Repository</h3> |
| 596 | |
| 597 | Because Git commingles the repository data with the initial checkout of |
| 598 | that repository, the default mode of operation in Git is to stick to that |
| @@ -660,10 +658,12 @@ | |
| 658 | |
| 659 | Plus, |
| 660 | <tt>cd</tt> is faster to type than <tt>git checkout</tt> or <tt>fossil |
| 661 | update</tt>. |
| 662 | |
| 663 | Parts of this section are [https://fossil-scm.org/forum/forumpost/5961e969fa|disputed] |
| 664 | by [https://github.com/olorin37|Jakub A. G.]. |
| 665 | |
| 666 | <h3 id="history">2.7 What you should have done vs. What you actually did</h3> |
| 667 | |
| 668 | Git puts a lot of emphasis on maintaining |
| 669 | a "clean" check-in history. Extraneous and experimental branches by |
| 670 |