Fossil SCM
Merged two nearly-redundant points about branch names syncing in fossil-v-git doc.
Commit
16ea738a8e14924ae8039a9fadfd78a0b6a2e80eb886fe5d628bf8baef115a15
Parent
1c9b177182e3621…
1 file changed
+7
-12
+7
-12
| --- www/fossil-v-git.wiki | ||
| +++ www/fossil-v-git.wiki | ||
| @@ -280,13 +280,17 @@ | ||
| 280 | 280 | put it well in his book on software project management, |
| 281 | 281 | <i>[https://www.amazon.com/dp/0735623198/|Dynamics of Software |
| 282 | 282 | Development]</i>: "[https://www.youtube.com/watch?v=oY6BCHqEbyc|Beware |
| 283 | 283 | of a guy in a room]."</p></li> |
| 284 | 284 | |
| 285 | - <li><p><b>Branch names sync:</b> Unlike in Git, branch names are not | |
| 286 | - purely local labels. They sync along with everything else, so | |
| 287 | - everyone sees the same set of branch names.</p></li> | |
| 285 | + <li><p><b>Branch names sync:</b> Unlike in Git, branch names in | |
| 286 | + Fossil are not purely local labels. They sync along with everything | |
| 287 | + else, so everyone sees the same set of branch names. Fossil's design | |
| 288 | + choice here is a direct reflection of the Linux vs. SQLite project | |
| 289 | + outlook: SQLite's developers collaborate closely on a single | |
| 290 | + conherent project, whereas Linux's developers go off on tangents and | |
| 291 | + occasionally sync changes up with each other.</p></li> | |
| 288 | 292 | |
| 289 | 293 | <li><p><b>Private branches are rare:</b> |
| 290 | 294 | [/doc/trunk/www/private.wiki|Private branches exist in Fossil], but |
| 291 | 295 | they're normally used to handle rare exception cases, whereas in |
| 292 | 296 | many Git projects, they're part of the straight-line development |
| @@ -535,19 +539,10 @@ | ||
| 535 | 539 | Git's "detached head state." It's why Git has the cryptic <tt>@~</tt> |
| 536 | 540 | notation meaning "the parent of HEAD" (what Fossil simply |
| 537 | 541 | [./checkin_names.wiki|calls "prev"]) but there is no way to ask Git |
| 538 | 542 | for the child of the current checkin, as with "next" in Fossil. |
| 539 | 543 | |
| 540 | - * <b>Named branches</b> | |
| 541 | - | |
| 542 | - Branches in Fossil have persistent names that are propagated | |
| 543 | - to collaborators via [/help?cmd=push|push] and [/help?cmd=pull|pull]. | |
| 544 | - All developers see the same name on the same branch. Git, in contrast, | |
| 545 | - uses only local branch names, so developers working on the | |
| 546 | - same project can (and frequently do) use a different name for the | |
| 547 | - same branch. | |
| 548 | - | |
| 549 | 544 | * <b>The [/help?cmd=all|fossil all] command</b> |
| 550 | 545 | |
| 551 | 546 | Fossil keeps track of all repositories and check-outs and allows |
| 552 | 547 | operations over all of them with a single command. For example, in |
| 553 | 548 | Fossil is possible to request a pull of all repositories on a laptop |
| 554 | 549 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -280,13 +280,17 @@ | |
| 280 | put it well in his book on software project management, |
| 281 | <i>[https://www.amazon.com/dp/0735623198/|Dynamics of Software |
| 282 | Development]</i>: "[https://www.youtube.com/watch?v=oY6BCHqEbyc|Beware |
| 283 | of a guy in a room]."</p></li> |
| 284 | |
| 285 | <li><p><b>Branch names sync:</b> Unlike in Git, branch names are not |
| 286 | purely local labels. They sync along with everything else, so |
| 287 | everyone sees the same set of branch names.</p></li> |
| 288 | |
| 289 | <li><p><b>Private branches are rare:</b> |
| 290 | [/doc/trunk/www/private.wiki|Private branches exist in Fossil], but |
| 291 | they're normally used to handle rare exception cases, whereas in |
| 292 | many Git projects, they're part of the straight-line development |
| @@ -535,19 +539,10 @@ | |
| 535 | Git's "detached head state." It's why Git has the cryptic <tt>@~</tt> |
| 536 | notation meaning "the parent of HEAD" (what Fossil simply |
| 537 | [./checkin_names.wiki|calls "prev"]) but there is no way to ask Git |
| 538 | for the child of the current checkin, as with "next" in Fossil. |
| 539 | |
| 540 | * <b>Named branches</b> |
| 541 | |
| 542 | Branches in Fossil have persistent names that are propagated |
| 543 | to collaborators via [/help?cmd=push|push] and [/help?cmd=pull|pull]. |
| 544 | All developers see the same name on the same branch. Git, in contrast, |
| 545 | uses only local branch names, so developers working on the |
| 546 | same project can (and frequently do) use a different name for the |
| 547 | same branch. |
| 548 | |
| 549 | * <b>The [/help?cmd=all|fossil all] command</b> |
| 550 | |
| 551 | Fossil keeps track of all repositories and check-outs and allows |
| 552 | operations over all of them with a single command. For example, in |
| 553 | Fossil is possible to request a pull of all repositories on a laptop |
| 554 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -280,13 +280,17 @@ | |
| 280 | put it well in his book on software project management, |
| 281 | <i>[https://www.amazon.com/dp/0735623198/|Dynamics of Software |
| 282 | Development]</i>: "[https://www.youtube.com/watch?v=oY6BCHqEbyc|Beware |
| 283 | of a guy in a room]."</p></li> |
| 284 | |
| 285 | <li><p><b>Branch names sync:</b> Unlike in Git, branch names in |
| 286 | Fossil are not purely local labels. They sync along with everything |
| 287 | else, so everyone sees the same set of branch names. Fossil's design |
| 288 | choice here is a direct reflection of the Linux vs. SQLite project |
| 289 | outlook: SQLite's developers collaborate closely on a single |
| 290 | conherent project, whereas Linux's developers go off on tangents and |
| 291 | occasionally sync changes up with each other.</p></li> |
| 292 | |
| 293 | <li><p><b>Private branches are rare:</b> |
| 294 | [/doc/trunk/www/private.wiki|Private branches exist in Fossil], but |
| 295 | they're normally used to handle rare exception cases, whereas in |
| 296 | many Git projects, they're part of the straight-line development |
| @@ -535,19 +539,10 @@ | |
| 539 | Git's "detached head state." It's why Git has the cryptic <tt>@~</tt> |
| 540 | notation meaning "the parent of HEAD" (what Fossil simply |
| 541 | [./checkin_names.wiki|calls "prev"]) but there is no way to ask Git |
| 542 | for the child of the current checkin, as with "next" in Fossil. |
| 543 | |
| 544 | * <b>The [/help?cmd=all|fossil all] command</b> |
| 545 | |
| 546 | Fossil keeps track of all repositories and check-outs and allows |
| 547 | operations over all of them with a single command. For example, in |
| 548 | Fossil is possible to request a pull of all repositories on a laptop |
| 549 |