Fossil SCM
First draft of the "branching" document.
Commit
2e275c14202446fca2bb8a48a8d15ed82d9bbc33
Parent
cf9ee7d67e08666…
9 files changed
+84
+8
-2
+2
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
+84
| --- a/www/branching.wiki | ||
| +++ b/www/branching.wiki | ||
| @@ -0,0 +1,84 @@ | ||
| 1 | +<h1o programmers91o programmers whos | |
| 2 | +"autosync"] mode. force" option | |
| 3 | + two commits against | |
| 4 | + Every repository is created with a single empty check-in that has two | |
| 5 | + figure 5, that initial empty | |
| 6 | +The | |
| 7 | + s a distributed system. | |
| 8 | +Butsoevolutand so we will | |
| 9 | +henceforth call it ail it ain the definition of | |
| 10 | +"leaf" later.hecked in, we have a ituation Suppose the two programmers who were | |
| 11 | +editing check-in 2 are named hdirect child ofal<h1o programmers91o programmers whos | |
| 12 | +"autosync"] mode. force" option | |
| 13 | + two commits against | |
| 14 | + Every repository is created with a single empty check-in that has two | |
| 15 | + figure 5, that initial empty | |
| 16 | +The | |
| 17 | + s a distributed system. | |
| 18 | +Butsoevolutand so we will | |
| 19 | +henceforth call it ain the definition of | |
| 20 | +"leaf" later.hecked in, we have a ituation Suppose the two programmers who were | |
| 21 | +editing check-in 2 are named hrammers91o prquickly resolved single empty check-in that has two | |
| 22 | + figure 5, that initial empty | |
| 23 | +The | |
| 24 | + s a distributed system. | |
| 25 | +Butsoevolutand so we will | |
| 26 | +henceforth call it ain the definition of | |
| 27 | +"leaf" later.hecked in, we have a ituation Suppose the two programmers who were | |
| 28 | +editing check-in 2 are named h<h1o programm tag propagationers whos | |
| 29 | +"autosync"] mode. force" option | |
| 30 | + two commits against | |
| 31 | + Every repository is created with a single empty check-in that has two | |
| 32 | + figure 5, that initial empty | |
| 33 | +The | |
| 34 | + s a distributed system. | |
| 35 | +Butsoevolutand so we will | |
| 36 | +henceforth call it ain the definition of | |
| 37 | +"leaf" later.hecked in, we have a ituation Suppose the two programmers who were | |
| 38 | +editing check-in 2 are named hdirect child ofal<h1o programmers91o programmers whos | |
| 39 | +"autosync"] mode. force" option | |
| 40 | + two commits against | |
| 41 | + Every repository is created with a single empty check-in that has two | |
| 42 | + figure 5, that initial empty | |
| 43 | +The | |
| 44 | + s a distributed system. | |
| 45 | +Butsoevolutand so we will | |
| 46 | +henceforth call it ain the definition of | |
| 47 | +"leaf" later.hecked in, we have a ituation Suppose the two programmers who were | |
| 48 | +editing check-in 2 are named hrammers91o prquickly resolved single empty check-in that has two | |
| 49 | + figure 5, that initial empty | |
| 50 | +The | |
| 51 | + s a distributed system. | |
| 52 | +Butsoevolutand so we will | |
| 53 | +henceforth call it ain the definition of | |
| 54 | +"leaf" later.hecked in, we have a ituation Suppose the two programmers who were | |
| 55 | +editing check-in 2 are named h<h1o programmers91o programmers whos | |
| 56 | +"autosync"] mode. force" option | |
| 57 | + two commits against | |
| 58 | + Every repository is created with a single empty check-in that has two | |
| 59 | + figure 5, that initial empty | |
| 60 | +The | |
| 61 | + s a distributed system. | |
| 62 | +Butsoevolutand so we will | |
| 63 | +henceforth call it ain the definition of | |
| 64 | +"leaf" later.hecked in, we have a ituation Suppose the two programmers who were | |
| 65 | +editing check-in 2 are named hdirect child ofal<h1o programmers91o programmers whos | |
| 66 | +"autosync"] mode. force" option | |
| 67 | + two commits against | |
| 68 | + Every repository is created with a single empty check-in that has eIn4 of figure 3 iish1o programmers91o programmers whos | |
| 69 | +"autosync"] mode. force" option | |
| 70 | + two commits against | |
| 71 | + Every repository is created with a single empty check-in that has two | |
| 72 | + figure 5, that initial empty | |
| 73 | +The | |
| 74 | + s a distributed system. | |
| 75 | +Butsoevolutand so we will | |
| 76 | +henceforth call it ain the definition of | |
| 77 | +"leaf" later.hecked in, we have a ituation Suppose the two programmers who were | |
| 78 | +editing check-in 2 are named hdirect child ofal<h1o programmers91o programmers whos | |
| 79 | +"autosync"] mode. force" option | |
| 80 | + two commits against | |
| 81 | + Every repository is created with a single empty check-in that has two | |
| 82 | + figure 5, that initial empty | |
| 83 | +The | |
| 84 | + s a distribogrammers whngnchildred |
| --- a/www/branching.wiki | |
| +++ b/www/branching.wiki | |
| @@ -0,0 +1,84 @@ | |
| --- a/www/branching.wiki | |
| +++ b/www/branching.wiki | |
| @@ -0,0 +1,84 @@ | |
| 1 | <h1o programmers91o programmers whos |
| 2 | "autosync"] mode. force" option |
| 3 | two commits against |
| 4 | Every repository is created with a single empty check-in that has two |
| 5 | figure 5, that initial empty |
| 6 | The |
| 7 | s a distributed system. |
| 8 | Butsoevolutand so we will |
| 9 | henceforth call it ail it ain the definition of |
| 10 | "leaf" later.hecked in, we have a ituation Suppose the two programmers who were |
| 11 | editing check-in 2 are named hdirect child ofal<h1o programmers91o programmers whos |
| 12 | "autosync"] mode. force" option |
| 13 | two commits against |
| 14 | Every repository is created with a single empty check-in that has two |
| 15 | figure 5, that initial empty |
| 16 | The |
| 17 | s a distributed system. |
| 18 | Butsoevolutand so we will |
| 19 | henceforth call it ain the definition of |
| 20 | "leaf" later.hecked in, we have a ituation Suppose the two programmers who were |
| 21 | editing check-in 2 are named hrammers91o prquickly resolved single empty check-in that has two |
| 22 | figure 5, that initial empty |
| 23 | The |
| 24 | s a distributed system. |
| 25 | Butsoevolutand so we will |
| 26 | henceforth call it ain the definition of |
| 27 | "leaf" later.hecked in, we have a ituation Suppose the two programmers who were |
| 28 | editing check-in 2 are named h<h1o programm tag propagationers whos |
| 29 | "autosync"] mode. force" option |
| 30 | two commits against |
| 31 | Every repository is created with a single empty check-in that has two |
| 32 | figure 5, that initial empty |
| 33 | The |
| 34 | s a distributed system. |
| 35 | Butsoevolutand so we will |
| 36 | henceforth call it ain the definition of |
| 37 | "leaf" later.hecked in, we have a ituation Suppose the two programmers who were |
| 38 | editing check-in 2 are named hdirect child ofal<h1o programmers91o programmers whos |
| 39 | "autosync"] mode. force" option |
| 40 | two commits against |
| 41 | Every repository is created with a single empty check-in that has two |
| 42 | figure 5, that initial empty |
| 43 | The |
| 44 | s a distributed system. |
| 45 | Butsoevolutand so we will |
| 46 | henceforth call it ain the definition of |
| 47 | "leaf" later.hecked in, we have a ituation Suppose the two programmers who were |
| 48 | editing check-in 2 are named hrammers91o prquickly resolved single empty check-in that has two |
| 49 | figure 5, that initial empty |
| 50 | The |
| 51 | s a distributed system. |
| 52 | Butsoevolutand so we will |
| 53 | henceforth call it ain the definition of |
| 54 | "leaf" later.hecked in, we have a ituation Suppose the two programmers who were |
| 55 | editing check-in 2 are named h<h1o programmers91o programmers whos |
| 56 | "autosync"] mode. force" option |
| 57 | two commits against |
| 58 | Every repository is created with a single empty check-in that has two |
| 59 | figure 5, that initial empty |
| 60 | The |
| 61 | s a distributed system. |
| 62 | Butsoevolutand so we will |
| 63 | henceforth call it ain the definition of |
| 64 | "leaf" later.hecked in, we have a ituation Suppose the two programmers who were |
| 65 | editing check-in 2 are named hdirect child ofal<h1o programmers91o programmers whos |
| 66 | "autosync"] mode. force" option |
| 67 | two commits against |
| 68 | Every repository is created with a single empty check-in that has eIn4 of figure 3 iish1o programmers91o programmers whos |
| 69 | "autosync"] mode. force" option |
| 70 | two commits against |
| 71 | Every repository is created with a single empty check-in that has two |
| 72 | figure 5, that initial empty |
| 73 | The |
| 74 | s a distributed system. |
| 75 | Butsoevolutand so we will |
| 76 | henceforth call it ain the definition of |
| 77 | "leaf" later.hecked in, we have a ituation Suppose the two programmers who were |
| 78 | editing check-in 2 are named hdirect child ofal<h1o programmers91o programmers whos |
| 79 | "autosync"] mode. force" option |
| 80 | two commits against |
| 81 | Every repository is created with a single empty check-in that has two |
| 82 | figure 5, that initial empty |
| 83 | The |
| 84 | s a distribogrammers whngnchildred |
+8
-2
| --- www/concepts.wiki | ||
| +++ www/concepts.wiki | ||
| @@ -212,13 +212,13 @@ | ||
| 212 | 212 | <img src="concept2.gif" align="right" hspace="10"> |
| 213 | 213 | |
| 214 | 214 | <p>Fossil has two modes of operation: "autosync" and "non-autosync". |
| 215 | 215 | Autosync mode works something like CVS or SVN in that it automatically |
| 216 | 216 | keeps your work in sync with the central server. Non-autosync is |
| 217 | -more like GIT, or Bitkeeper in that your local repository develops | |
| 217 | +more like GIT or Bitkeeper in that your local repository develops | |
| 218 | 218 | independently of your coworkers and you share your changes manually. |
| 219 | -The interesting thing about fossil is that it supports both autosync | |
| 219 | +An interesting feature of fossil is that it supports both autosync | |
| 220 | 220 | and non-autosync work flows.</p> |
| 221 | 221 | |
| 222 | 222 | <p>The default setting for fossil is to be in autosync mode. You |
| 223 | 223 | can change the autosync setting or check the current autosync |
| 224 | 224 | setting using commands like:</p> |
| @@ -382,10 +382,16 @@ | ||
| 382 | 382 | <p>A stand-alone server is a great way to set of transient connections |
| 383 | 383 | between coworkers for doing quick pushes or pulls. But you can also |
| 384 | 384 | set up a permanent stand-alone server if you prefer. Just make |
| 385 | 385 | arrangements for fossil to be launched with appropriate arguments |
| 386 | 386 | after every reboot.</p> |
| 387 | + | |
| 388 | +<p>If you just want a server to browse the built-in fossil website | |
| 389 | +locally, use the <b>ui</b> command in place of <b>server</b>. The | |
| 390 | +<b>ui</b> command starts up a local server too, but it also takes | |
| 391 | +the additional step of automatically launching your webbrowser and | |
| 392 | +pointing at the new server.</p> | |
| 387 | 393 | </li> |
| 388 | 394 | |
| 389 | 395 | <li><p><b>Setting up a CGI server</b></p> |
| 390 | 396 | |
| 391 | 397 | <p>If you have a webserver running on your machine already, you can |
| 392 | 398 |
| --- www/concepts.wiki | |
| +++ www/concepts.wiki | |
| @@ -212,13 +212,13 @@ | |
| 212 | <img src="concept2.gif" align="right" hspace="10"> |
| 213 | |
| 214 | <p>Fossil has two modes of operation: "autosync" and "non-autosync". |
| 215 | Autosync mode works something like CVS or SVN in that it automatically |
| 216 | keeps your work in sync with the central server. Non-autosync is |
| 217 | more like GIT, or Bitkeeper in that your local repository develops |
| 218 | independently of your coworkers and you share your changes manually. |
| 219 | The interesting thing about fossil is that it supports both autosync |
| 220 | and non-autosync work flows.</p> |
| 221 | |
| 222 | <p>The default setting for fossil is to be in autosync mode. You |
| 223 | can change the autosync setting or check the current autosync |
| 224 | setting using commands like:</p> |
| @@ -382,10 +382,16 @@ | |
| 382 | <p>A stand-alone server is a great way to set of transient connections |
| 383 | between coworkers for doing quick pushes or pulls. But you can also |
| 384 | set up a permanent stand-alone server if you prefer. Just make |
| 385 | arrangements for fossil to be launched with appropriate arguments |
| 386 | after every reboot.</p> |
| 387 | </li> |
| 388 | |
| 389 | <li><p><b>Setting up a CGI server</b></p> |
| 390 | |
| 391 | <p>If you have a webserver running on your machine already, you can |
| 392 |
| --- www/concepts.wiki | |
| +++ www/concepts.wiki | |
| @@ -212,13 +212,13 @@ | |
| 212 | <img src="concept2.gif" align="right" hspace="10"> |
| 213 | |
| 214 | <p>Fossil has two modes of operation: "autosync" and "non-autosync". |
| 215 | Autosync mode works something like CVS or SVN in that it automatically |
| 216 | keeps your work in sync with the central server. Non-autosync is |
| 217 | more like GIT or Bitkeeper in that your local repository develops |
| 218 | independently of your coworkers and you share your changes manually. |
| 219 | An interesting feature of fossil is that it supports both autosync |
| 220 | and non-autosync work flows.</p> |
| 221 | |
| 222 | <p>The default setting for fossil is to be in autosync mode. You |
| 223 | can change the autosync setting or check the current autosync |
| 224 | setting using commands like:</p> |
| @@ -382,10 +382,16 @@ | |
| 382 | <p>A stand-alone server is a great way to set of transient connections |
| 383 | between coworkers for doing quick pushes or pulls. But you can also |
| 384 | set up a permanent stand-alone server if you prefer. Just make |
| 385 | arrangements for fossil to be launched with appropriate arguments |
| 386 | after every reboot.</p> |
| 387 | |
| 388 | <p>If you just want a server to browse the built-in fossil website |
| 389 | locally, use the <b>ui</b> command in place of <b>server</b>. The |
| 390 | <b>ui</b> command starts up a local server too, but it also takes |
| 391 | the additional step of automatically launching your webbrowser and |
| 392 | pointing at the new server.</p> |
| 393 | </li> |
| 394 | |
| 395 | <li><p><b>Setting up a CGI server</b></p> |
| 396 | |
| 397 | <p>If you have a webserver running on your machine already, you can |
| 398 |
+2
| --- www/index.wiki | ||
| +++ www/index.wiki | ||
| @@ -58,10 +58,12 @@ | ||
| 58 | 58 | * The [./concepts.wiki | concepts] behind fossil |
| 59 | 59 | * [./build.wiki | Building And Installing] |
| 60 | 60 | * [./quickstart.wiki | Quick Start] guide to using fossil |
| 61 | 61 | * Fossil supports [./embeddeddoc.wiki | embedded documentation] |
| 62 | 62 | that is versioned along with project source code. |
| 63 | + * A tutorial on [./branching.wiki | branching], what it means and how | |
| 64 | + to do it using fossil. | |
| 63 | 65 | * The [./selfcheck.wiki | automatic self-check] mechanism |
| 64 | 66 | helps insure project integrity. |
| 65 | 67 | * Fossil contains a [./wikitheory.wiki | built-in wiki]. |
| 66 | 68 | * There is a |
| 67 | 69 | [http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users | mailing list] |
| 68 | 70 |
| --- www/index.wiki | |
| +++ www/index.wiki | |
| @@ -58,10 +58,12 @@ | |
| 58 | * The [./concepts.wiki | concepts] behind fossil |
| 59 | * [./build.wiki | Building And Installing] |
| 60 | * [./quickstart.wiki | Quick Start] guide to using fossil |
| 61 | * Fossil supports [./embeddeddoc.wiki | embedded documentation] |
| 62 | that is versioned along with project source code. |
| 63 | * The [./selfcheck.wiki | automatic self-check] mechanism |
| 64 | helps insure project integrity. |
| 65 | * Fossil contains a [./wikitheory.wiki | built-in wiki]. |
| 66 | * There is a |
| 67 | [http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users | mailing list] |
| 68 |
| --- www/index.wiki | |
| +++ www/index.wiki | |
| @@ -58,10 +58,12 @@ | |
| 58 | * The [./concepts.wiki | concepts] behind fossil |
| 59 | * [./build.wiki | Building And Installing] |
| 60 | * [./quickstart.wiki | Quick Start] guide to using fossil |
| 61 | * Fossil supports [./embeddeddoc.wiki | embedded documentation] |
| 62 | that is versioned along with project source code. |
| 63 | * A tutorial on [./branching.wiki | branching], what it means and how |
| 64 | to do it using fossil. |
| 65 | * The [./selfcheck.wiki | automatic self-check] mechanism |
| 66 | helps insure project integrity. |
| 67 | * Fossil contains a [./wikitheory.wiki | built-in wiki]. |
| 68 | * There is a |
| 69 | [http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users | mailing list] |
| 70 |