Fossil SCM
Replaced use of HTML "p" tags in the fiveminutes.wiki doc with hard line breaks, letting the wiki language add the same "p" tags on output. Replaced some of them with "tt" tags instead to make command text stand out from the prose. Added "tt" tags elsewhere for consistency.
Commit
262eb510dfcdc738226afecd0c757995b2fa46a84b664a28dde47b19b27ea92e
Parent
ec7822601487734…
1 file changed
+60
-35
+60
-35
| --- www/fiveminutes.wiki | ||
| +++ www/fiveminutes.wiki | ||
| @@ -4,66 +4,91 @@ | ||
| 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 | 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 | |
| 9 | + | |
| 10 | +This short document explains the main basic Fossil commands for a single | |
| 10 | 11 | user, i.e. with no additional users, with no need to synchronize with some remote |
| 11 | -repository, and no need for branching/forking.</p> | |
| 12 | +repository, and no need for branching/forking. | |
| 12 | 13 | |
| 13 | 14 | <h2>Create a new repository</h2> |
| 14 | -<p>fossil new c:\test.repo</p> | |
| 15 | -<p>This will create the new SQLite binary file that holds the repository, i.e. | |
| 15 | + | |
| 16 | +<tt>fossil new c:\test.repo</tt> | |
| 17 | + | |
| 18 | +This will create the new SQLite binary file that holds the repository, i.e. | |
| 16 | 19 | files, tickets, wiki, etc. It can be located anywhere, although it's considered |
| 17 | 20 | best practice to keep it outside the work directory where you will work on files |
| 18 | -after they've been checked out of the repository.</p> | |
| 21 | +after they've been checked out of the repository. | |
| 19 | 22 | |
| 20 | 23 | <h2>Open the repository</h2> |
| 21 | -<p>cd c:\temp\test.fossil</p> | |
| 22 | -<p>fossil open c:\test.repo</p> | |
| 23 | -<p>This will check out the last revision of all the files in the repository, | |
| 24 | + | |
| 25 | +<tt>cd c:\temp\test.fossil | |
| 26 | +<br> | |
| 27 | +fossil open c:\test.repo</tt> | |
| 28 | + | |
| 29 | +This will check out the last revision of all the files in the repository, | |
| 24 | 30 | if any, into the current work directory. In addition, it will create a binary |
| 25 | 31 | file _FOSSIL_ to keep track of changes (on non-Windows systems it is called |
| 26 | -<tt>.fslckout</tt>).</p> | |
| 32 | +<tt>.fslckout</tt>). | |
| 27 | 33 | |
| 28 | 34 | <h2>Add new files</h2> |
| 29 | -<p>fossil add .</p> | |
| 30 | -<p>To tell Fossil to add new files to the repository. The files aren't actually | |
| 31 | -added until you run "commit". When using ".", it tells Fossil | |
| 35 | + | |
| 36 | +<tt>fossil add .</tt> | |
| 37 | + | |
| 38 | +To tell Fossil to add new files to the repository. The files aren't actually | |
| 39 | +added until you run "<tt>fossil commit</tt>. When using ".", it tells Fossil | |
| 32 | 40 | to add all the files in the current directory recursively, i.e. including all |
| 33 | -the files in all the subdirectories.</p> | |
| 34 | -<p>Note: To tell Fossil to ignore some extensions:</p> | |
| 35 | -<p>fossil settings ignore-glob "*.o,*.obj,*.exe" --global</p> | |
| 41 | +the files in all the subdirectories. | |
| 42 | + | |
| 43 | +Note: To tell Fossil to ignore some extensions: | |
| 44 | + | |
| 45 | +<tt>fossil settings ignore-glob "*.o,*.obj,*.exe" --global</tt> | |
| 36 | 46 | |
| 37 | 47 | <h2>Remove files that haven't been committed yet</h2> |
| 38 | -<p>fossil delete myfile.c</p> | |
| 39 | -<p>This will simply remove the item from the list of files that were previously | |
| 40 | -added through "fossil add".</p> | |
| 48 | + | |
| 49 | +<tt>fossil delete myfile.c</tt> | |
| 50 | + | |
| 51 | +This will simply remove the item from the list of files that were previously | |
| 52 | +added through "<tt>fossil add</tt>". | |
| 41 | 53 | |
| 42 | 54 | <h2>Check current status</h2> |
| 43 | -<p>fossil changes</p> | |
| 44 | -<p>This shows the list of changes that have been done and will be committed the | |
| 45 | -next time you run "fossil commit". It's a useful command to run before | |
| 46 | -running "fossil commit" just to check that things are OK before proceeding.</p> | |
| 55 | + | |
| 56 | +<tt>fossil changes</tt> | |
| 57 | + | |
| 58 | +This shows the list of changes that have been done and will be committed the | |
| 59 | +next time you run "<tt>fossil commit</tt>". It's a useful command to run before | |
| 60 | +running "<tt>fossil commit</tt>" just to check that things are OK before proceeding. | |
| 47 | 61 | |
| 48 | 62 | <h2>Commit changes</h2> |
| 49 | -<p>To actually apply the pending changes to the repository, e.g. new files marked | |
| 63 | + | |
| 64 | +To actually apply the pending changes to the repository, e.g. new files marked | |
| 50 | 65 | for addition, checked-out files that have been edited and must be checked-in, |
| 51 | -etc.</p> | |
| 66 | +etc. | |
| 52 | 67 | |
| 53 | -<p>fossil commit -m "Added stuff"</p> | |
| 68 | +<tt>fossil commit -m "Added stuff"</tt> | |
| 54 | 69 | |
| 55 | 70 | If no file names are provided on the command-line then all changes will be checked in, |
| 56 | 71 | otherwise just the listed file(s) will be checked in. |
| 57 | 72 | |
| 58 | 73 | <h2>Compare two revisions of a file</h2> |
| 59 | -<p>If you wish to compare the last revision of a file and its checked out version | |
| 60 | -in your work directory:</p> | |
| 61 | -<p>fossil gdiff myfile.c</p> | |
| 62 | -<p>If you wish to compare two different revisions of a file in the repository:</p> | |
| 63 | -<p>fossil finfo myfile: Note the first hash, which is the hash of the commit | |
| 64 | -when the file was committed</p> | |
| 65 | -<p>fossil gdiff --from HASH#1 --to HASH#2 myfile.c</p> | |
| 74 | + | |
| 75 | +If you wish to compare the last revision of a file and its checked out version | |
| 76 | +in your work directory: | |
| 77 | + | |
| 78 | +<tt>fossil gdiff myfile.c</tt> | |
| 79 | + | |
| 80 | +If you wish to compare two different revisions of a file in the repository: | |
| 81 | + | |
| 82 | +<tt>fossil finfo myfile</tt> | |
| 83 | + | |
| 84 | +Note the first hash, which is the hash of the commit | |
| 85 | +when the file was committed. | |
| 86 | + | |
| 87 | +<tt>fossil gdiff --from HASH#1 --to HASH#2 myfile.c</tt> | |
| 88 | + | |
| 66 | 89 | <h2>Cancel changes and go back to previous revision</h2> |
| 67 | -<p>fossil revert myfile.c</p> | |
| 68 | -<p>Fossil does not prompt when reverting a file. It simply reminds the user about the | |
| 69 | -"undo" command, just in case the revert was a mistake.</p> | |
| 90 | + | |
| 91 | +<tt>fossil revert myfile.c</tt> | |
| 92 | + | |
| 93 | +Fossil does not prompt when reverting a file. It simply reminds the user about the | |
| 94 | +"undo" command, just in case the revert was a mistake. | |
| 70 | 95 |
| --- www/fiveminutes.wiki | |
| +++ www/fiveminutes.wiki | |
| @@ -4,66 +4,91 @@ | |
| 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, i.e. with no additional users, with no need to synchronize with some remote |
| 11 | repository, and no need for branching/forking.</p> |
| 12 | |
| 13 | <h2>Create a new repository</h2> |
| 14 | <p>fossil new c:\test.repo</p> |
| 15 | <p>This will create the new SQLite binary file that holds the repository, i.e. |
| 16 | files, tickets, wiki, etc. It can be located anywhere, although it's considered |
| 17 | best practice to keep it outside the work directory where you will work on files |
| 18 | after they've been checked out of the repository.</p> |
| 19 | |
| 20 | <h2>Open the repository</h2> |
| 21 | <p>cd c:\temp\test.fossil</p> |
| 22 | <p>fossil open c:\test.repo</p> |
| 23 | <p>This will check out the last revision of all the files in the repository, |
| 24 | if any, into the current work directory. In addition, it will create a binary |
| 25 | file _FOSSIL_ to keep track of changes (on non-Windows systems it is called |
| 26 | <tt>.fslckout</tt>).</p> |
| 27 | |
| 28 | <h2>Add new files</h2> |
| 29 | <p>fossil add .</p> |
| 30 | <p>To tell Fossil to add new files to the repository. The files aren't actually |
| 31 | added until you run "commit". When using ".", it tells Fossil |
| 32 | to add all the files in the current directory recursively, i.e. including all |
| 33 | the files in all the subdirectories.</p> |
| 34 | <p>Note: To tell Fossil to ignore some extensions:</p> |
| 35 | <p>fossil settings ignore-glob "*.o,*.obj,*.exe" --global</p> |
| 36 | |
| 37 | <h2>Remove files that haven't been committed yet</h2> |
| 38 | <p>fossil delete myfile.c</p> |
| 39 | <p>This will simply remove the item from the list of files that were previously |
| 40 | added through "fossil add".</p> |
| 41 | |
| 42 | <h2>Check current status</h2> |
| 43 | <p>fossil changes</p> |
| 44 | <p>This shows the list of changes that have been done and will be committed the |
| 45 | next time you run "fossil commit". It's a useful command to run before |
| 46 | running "fossil commit" just to check that things are OK before proceeding.</p> |
| 47 | |
| 48 | <h2>Commit changes</h2> |
| 49 | <p>To actually apply the pending changes to the repository, e.g. new files marked |
| 50 | for addition, checked-out files that have been edited and must be checked-in, |
| 51 | etc.</p> |
| 52 | |
| 53 | <p>fossil commit -m "Added stuff"</p> |
| 54 | |
| 55 | If no file names are provided on the command-line then all changes will be checked in, |
| 56 | otherwise just the listed file(s) will be checked in. |
| 57 | |
| 58 | <h2>Compare two revisions of a file</h2> |
| 59 | <p>If you wish to compare the last revision of a file and its checked out version |
| 60 | in your work directory:</p> |
| 61 | <p>fossil gdiff myfile.c</p> |
| 62 | <p>If you wish to compare two different revisions of a file in the repository:</p> |
| 63 | <p>fossil finfo myfile: Note the first hash, which is the hash of the commit |
| 64 | when the file was committed</p> |
| 65 | <p>fossil gdiff --from HASH#1 --to HASH#2 myfile.c</p> |
| 66 | <h2>Cancel changes and go back to previous revision</h2> |
| 67 | <p>fossil revert myfile.c</p> |
| 68 | <p>Fossil does not prompt when reverting a file. It simply reminds the user about the |
| 69 | "undo" command, just in case the revert was a mistake.</p> |
| 70 |
| --- www/fiveminutes.wiki | |
| +++ www/fiveminutes.wiki | |
| @@ -4,66 +4,91 @@ | |
| 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 | |
| 10 | This short document explains the main basic Fossil commands for a single |
| 11 | user, i.e. with no additional users, with no need to synchronize with some remote |
| 12 | repository, and no need for branching/forking. |
| 13 | |
| 14 | <h2>Create a new repository</h2> |
| 15 | |
| 16 | <tt>fossil new c:\test.repo</tt> |
| 17 | |
| 18 | This will create the new SQLite binary file that holds the repository, i.e. |
| 19 | files, tickets, wiki, etc. It can be located anywhere, although it's considered |
| 20 | best practice to keep it outside the work directory where you will work on files |
| 21 | after they've been checked out of the repository. |
| 22 | |
| 23 | <h2>Open the repository</h2> |
| 24 | |
| 25 | <tt>cd c:\temp\test.fossil |
| 26 | <br> |
| 27 | fossil open c:\test.repo</tt> |
| 28 | |
| 29 | This will check out the last revision of all the files in the repository, |
| 30 | if any, into the current work directory. In addition, it will create a binary |
| 31 | file _FOSSIL_ to keep track of changes (on non-Windows systems it is called |
| 32 | <tt>.fslckout</tt>). |
| 33 | |
| 34 | <h2>Add new files</h2> |
| 35 | |
| 36 | <tt>fossil add .</tt> |
| 37 | |
| 38 | To tell Fossil to add new files to the repository. The files aren't actually |
| 39 | added until you run "<tt>fossil commit</tt>. When using ".", it tells Fossil |
| 40 | to add all the files in the current directory recursively, i.e. including all |
| 41 | the files in all the subdirectories. |
| 42 | |
| 43 | Note: To tell Fossil to ignore some extensions: |
| 44 | |
| 45 | <tt>fossil settings ignore-glob "*.o,*.obj,*.exe" --global</tt> |
| 46 | |
| 47 | <h2>Remove files that haven't been committed yet</h2> |
| 48 | |
| 49 | <tt>fossil delete myfile.c</tt> |
| 50 | |
| 51 | This will simply remove the item from the list of files that were previously |
| 52 | added through "<tt>fossil add</tt>". |
| 53 | |
| 54 | <h2>Check current status</h2> |
| 55 | |
| 56 | <tt>fossil changes</tt> |
| 57 | |
| 58 | This shows the list of changes that have been done and will be committed the |
| 59 | next time you run "<tt>fossil commit</tt>". It's a useful command to run before |
| 60 | running "<tt>fossil commit</tt>" just to check that things are OK before proceeding. |
| 61 | |
| 62 | <h2>Commit changes</h2> |
| 63 | |
| 64 | To actually apply the pending changes to the repository, e.g. new files marked |
| 65 | for addition, checked-out files that have been edited and must be checked-in, |
| 66 | etc. |
| 67 | |
| 68 | <tt>fossil commit -m "Added stuff"</tt> |
| 69 | |
| 70 | If no file names are provided on the command-line then all changes will be checked in, |
| 71 | otherwise just the listed file(s) will be checked in. |
| 72 | |
| 73 | <h2>Compare two revisions of a file</h2> |
| 74 | |
| 75 | If you wish to compare the last revision of a file and its checked out version |
| 76 | in your work directory: |
| 77 | |
| 78 | <tt>fossil gdiff myfile.c</tt> |
| 79 | |
| 80 | If you wish to compare two different revisions of a file in the repository: |
| 81 | |
| 82 | <tt>fossil finfo myfile</tt> |
| 83 | |
| 84 | Note the first hash, which is the hash of the commit |
| 85 | when the file was committed. |
| 86 | |
| 87 | <tt>fossil gdiff --from HASH#1 --to HASH#2 myfile.c</tt> |
| 88 | |
| 89 | <h2>Cancel changes and go back to previous revision</h2> |
| 90 | |
| 91 | <tt>fossil revert myfile.c</tt> |
| 92 | |
| 93 | Fossil does not prompt when reverting a file. It simply reminds the user about the |
| 94 | "undo" command, just in case the revert was a mistake. |
| 95 |