Fossil SCM
Errata for the 5-minute tutorial page.
Commit
be93ecb3a5758b84592f6fb0249420744f10c5ca
Parent
66c4f17a6ea17d0…
1 file changed
+8
-8
+8
-8
| --- www/fiveminutes.wiki | ||
| +++ www/fiveminutes.wiki | ||
| @@ -1,13 +1,13 @@ | ||
| 1 | -<title>Up and running in 5mn as a single user</title> | |
| 1 | +<title>Up and running in 5 minutes as a single user</title> | |
| 2 | 2 | |
| 3 | 3 | <p align="center"><b><i> |
| 4 | 4 | The following document was contributed by Gilles Ganault on 2013-01-08. |
| 5 | 5 | </i></b> |
| 6 | 6 | </p><hr> |
| 7 | 7 | |
| 8 | -<h1>Up and running in 5mn as a single user</h1> | |
| 8 | +<h1>Up and running in 5 minutes as a single user</h1> | |
| 9 | 9 | <p>This short document explains the main basic Fossil commands for a single |
| 10 | 10 | user, ie. with no additional users, with no need to synchronize with some remote |
| 11 | 11 | repository, and no need for branching/forking.</p> |
| 12 | 12 | <h2>Create a new repository</h2> |
| 13 | 13 | <p>fossil new c:\test.repo</p> |
| @@ -18,11 +18,12 @@ | ||
| 18 | 18 | <h2>Open the repository</h2> |
| 19 | 19 | <p>cd c:\temp\test.fossil</p> |
| 20 | 20 | <p>fossil open c:\test.repo</p> |
| 21 | 21 | <p>This will check out the last revision of all the files in the repository, |
| 22 | 22 | if any, into the current work directory. In addition, it will create a binary |
| 23 | -file _FOSSIL_ to keep track of changes.</p> | |
| 23 | +file _FOSSIL_ to keep track of changes (on non-Windows systems it is called | |
| 24 | +<tt>.fslckout</tt>).</p> | |
| 24 | 25 | <h2>Add new files</h2> |
| 25 | 26 | <p>fossil add .</p> |
| 26 | 27 | <p>To tell Fossil to add new files to the repository. The files aren't actually |
| 27 | 28 | added until you run "commit". When using ".", it tells Fossil |
| 28 | 29 | to add all the files in the current directory recursively, ie. including all |
| @@ -35,11 +36,11 @@ | ||
| 35 | 36 | added through "fossil add".</p> |
| 36 | 37 | <h2>Check current status</h2> |
| 37 | 38 | <p>fossil changes</p> |
| 38 | 39 | <p>This shows the list of changes that have been done and will be commited the |
| 39 | 40 | next time you run "fossil commit". It's a useful command to run before |
| 40 | -running "fossil commit" just to check that things are OK befor proceeding.</p> | |
| 41 | +running "fossil commit" just to check that things are OK before proceeding.</p> | |
| 41 | 42 | <h2>Commit changes</h2> |
| 42 | 43 | <p>To actually apply the pending changes to the repository, eg. new files marked |
| 43 | 44 | for addition, checked-out files that have been edited and must be checked-in, |
| 44 | 45 | etc.</p> |
| 45 | 46 | <h2>Compare two revisions of a file</h2> |
| @@ -48,15 +49,14 @@ | ||
| 48 | 49 | <p>fossil gdiff myfile.c</p> |
| 49 | 50 | <p>If you wish to compare two different revisions of a file in the repository:</p> |
| 50 | 51 | <p>fossil finfo myfile: Note the first hash, which is the UUID of the commit |
| 51 | 52 | when the file was commited</p> |
| 52 | 53 | <p>fossil gdiff --from UUID#1 --to UUID#2 myfile.c</p> |
| 53 | -<h2>Cancel changes and go back to prevision revision</h2> | |
| 54 | +<h2>Cancel changes and go back to previous revision</h2> | |
| 54 | 55 | <p>fossil revert myfile.c</p> |
| 55 | -<p>This will replace the file in the current directory with its latest revision | |
| 56 | -in the repository. For security, since the work file hasn't been checked in, | |
| 57 | -Fossil will prompt you to confirm that you do wish to replace the file.</p> | |
| 56 | +<p>Fossil does not prompt when reverting a file. It simply reminds the user about the | |
| 57 | +"undo" command, just in case the revert was a mistake.</p> | |
| 58 | 58 | <h2>Close the repository</h2> |
| 59 | 59 | <p>fossil close</p> |
| 60 | 60 | <p>This will simply remote the _FOSSIL_ at the root of the work directory but |
| 61 | 61 | will not delete the files in the work directory. From then on, any use of "fossil" |
| 62 | 62 | will trigger an error since there is no longer any connection.</p> |
| 63 | 63 |
| --- www/fiveminutes.wiki | |
| +++ www/fiveminutes.wiki | |
| @@ -1,13 +1,13 @@ | |
| 1 | <title>Up and running in 5mn as a single user</title> |
| 2 | |
| 3 | <p align="center"><b><i> |
| 4 | The following document was contributed by Gilles Ganault on 2013-01-08. |
| 5 | </i></b> |
| 6 | </p><hr> |
| 7 | |
| 8 | <h1>Up and running in 5mn as a single user</h1> |
| 9 | <p>This short document explains the main basic Fossil commands for a single |
| 10 | user, ie. with no additional users, with no need to synchronize with some remote |
| 11 | repository, and no need for branching/forking.</p> |
| 12 | <h2>Create a new repository</h2> |
| 13 | <p>fossil new c:\test.repo</p> |
| @@ -18,11 +18,12 @@ | |
| 18 | <h2>Open the repository</h2> |
| 19 | <p>cd c:\temp\test.fossil</p> |
| 20 | <p>fossil open c:\test.repo</p> |
| 21 | <p>This will check out the last revision of all the files in the repository, |
| 22 | if any, into the current work directory. In addition, it will create a binary |
| 23 | file _FOSSIL_ to keep track of changes.</p> |
| 24 | <h2>Add new files</h2> |
| 25 | <p>fossil add .</p> |
| 26 | <p>To tell Fossil to add new files to the repository. The files aren't actually |
| 27 | added until you run "commit". When using ".", it tells Fossil |
| 28 | to add all the files in the current directory recursively, ie. including all |
| @@ -35,11 +36,11 @@ | |
| 35 | added through "fossil add".</p> |
| 36 | <h2>Check current status</h2> |
| 37 | <p>fossil changes</p> |
| 38 | <p>This shows the list of changes that have been done and will be commited the |
| 39 | next time you run "fossil commit". It's a useful command to run before |
| 40 | running "fossil commit" just to check that things are OK befor proceeding.</p> |
| 41 | <h2>Commit changes</h2> |
| 42 | <p>To actually apply the pending changes to the repository, eg. new files marked |
| 43 | for addition, checked-out files that have been edited and must be checked-in, |
| 44 | etc.</p> |
| 45 | <h2>Compare two revisions of a file</h2> |
| @@ -48,15 +49,14 @@ | |
| 48 | <p>fossil gdiff myfile.c</p> |
| 49 | <p>If you wish to compare two different revisions of a file in the repository:</p> |
| 50 | <p>fossil finfo myfile: Note the first hash, which is the UUID of the commit |
| 51 | when the file was commited</p> |
| 52 | <p>fossil gdiff --from UUID#1 --to UUID#2 myfile.c</p> |
| 53 | <h2>Cancel changes and go back to prevision revision</h2> |
| 54 | <p>fossil revert myfile.c</p> |
| 55 | <p>This will replace the file in the current directory with its latest revision |
| 56 | in the repository. For security, since the work file hasn't been checked in, |
| 57 | Fossil will prompt you to confirm that you do wish to replace the file.</p> |
| 58 | <h2>Close the repository</h2> |
| 59 | <p>fossil close</p> |
| 60 | <p>This will simply remote the _FOSSIL_ at the root of the work directory but |
| 61 | will not delete the files in the work directory. From then on, any use of "fossil" |
| 62 | will trigger an error since there is no longer any connection.</p> |
| 63 |
| --- www/fiveminutes.wiki | |
| +++ www/fiveminutes.wiki | |
| @@ -1,13 +1,13 @@ | |
| 1 | <title>Up and running in 5 minutes as a single user</title> |
| 2 | |
| 3 | <p align="center"><b><i> |
| 4 | The following document was contributed by Gilles Ganault on 2013-01-08. |
| 5 | </i></b> |
| 6 | </p><hr> |
| 7 | |
| 8 | <h1>Up and running in 5 minutes as a single user</h1> |
| 9 | <p>This short document explains the main basic Fossil commands for a single |
| 10 | user, ie. with no additional users, with no need to synchronize with some remote |
| 11 | repository, and no need for branching/forking.</p> |
| 12 | <h2>Create a new repository</h2> |
| 13 | <p>fossil new c:\test.repo</p> |
| @@ -18,11 +18,12 @@ | |
| 18 | <h2>Open the repository</h2> |
| 19 | <p>cd c:\temp\test.fossil</p> |
| 20 | <p>fossil open c:\test.repo</p> |
| 21 | <p>This will check out the last revision of all the files in the repository, |
| 22 | if any, into the current work directory. In addition, it will create a binary |
| 23 | file _FOSSIL_ to keep track of changes (on non-Windows systems it is called |
| 24 | <tt>.fslckout</tt>).</p> |
| 25 | <h2>Add new files</h2> |
| 26 | <p>fossil add .</p> |
| 27 | <p>To tell Fossil to add new files to the repository. The files aren't actually |
| 28 | added until you run "commit". When using ".", it tells Fossil |
| 29 | to add all the files in the current directory recursively, ie. including all |
| @@ -35,11 +36,11 @@ | |
| 36 | added through "fossil add".</p> |
| 37 | <h2>Check current status</h2> |
| 38 | <p>fossil changes</p> |
| 39 | <p>This shows the list of changes that have been done and will be commited the |
| 40 | next time you run "fossil commit". It's a useful command to run before |
| 41 | running "fossil commit" just to check that things are OK before proceeding.</p> |
| 42 | <h2>Commit changes</h2> |
| 43 | <p>To actually apply the pending changes to the repository, eg. new files marked |
| 44 | for addition, checked-out files that have been edited and must be checked-in, |
| 45 | etc.</p> |
| 46 | <h2>Compare two revisions of a file</h2> |
| @@ -48,15 +49,14 @@ | |
| 49 | <p>fossil gdiff myfile.c</p> |
| 50 | <p>If you wish to compare two different revisions of a file in the repository:</p> |
| 51 | <p>fossil finfo myfile: Note the first hash, which is the UUID of the commit |
| 52 | when the file was commited</p> |
| 53 | <p>fossil gdiff --from UUID#1 --to UUID#2 myfile.c</p> |
| 54 | <h2>Cancel changes and go back to previous revision</h2> |
| 55 | <p>fossil revert myfile.c</p> |
| 56 | <p>Fossil does not prompt when reverting a file. It simply reminds the user about the |
| 57 | "undo" command, just in case the revert was a mistake.</p> |
| 58 | <h2>Close the repository</h2> |
| 59 | <p>fossil close</p> |
| 60 | <p>This will simply remote the _FOSSIL_ at the root of the work directory but |
| 61 | will not delete the files in the work directory. From then on, any use of "fossil" |
| 62 | will trigger an error since there is no longer any connection.</p> |
| 63 |