Fossil SCM
A prior edit to the quickstart doc left a vestigial version of the "Making and Committing Changes" section behind, resulting in duplicate information and a second h2 section with the same fragment ID. Some differences existed between the two presentations, so merged them rather than nuke the smaller (presumably older) one outright.
Commit
39beee4c9d5e0a063b71eacb26f6a69e9e5131ccd94261bbeeb29497ff39391e
Parent
1fd407f61ae8824…
1 file changed
+11
-36
+11
-36
| --- www/quickstart.wiki | ||
| +++ www/quickstart.wiki | ||
| @@ -243,13 +243,15 @@ | ||
| 243 | 243 | +Made some changes to the project<br> |
| 244 | 244 | # Original text<br> |
| 245 | 245 | </tt></b> |
| 246 | 246 | </blockquote> |
| 247 | 247 | |
| 248 | -"fossil diff" is the difference between your tree on disk now and as the tree was | |
| 249 | -when you did "fossil open". An open is the first checkout from a repository | |
| 250 | -into a new directory. | |
| 248 | +"fossil diff" shows the difference between your tree on disk now and as | |
| 249 | +the tree was when you last committed changes. If you haven't committed | |
| 250 | +yet, then it shows the difference relative to the tip-of-trunk commit in | |
| 251 | +the repository, being what you get when you "fossil open" a repository | |
| 252 | +without specifying a version, populating the working directory. | |
| 251 | 253 | |
| 252 | 254 | To see the most recent changes made to the repository by other users, use "fossil timeline" to |
| 253 | 255 | find out the most recent commit, and then "fossil diff" between that commit and the |
| 254 | 256 | current tree: |
| 255 | 257 | <blockquote> |
| @@ -292,15 +294,16 @@ | ||
| 292 | 294 | |
| 293 | 295 | You will be prompted for check-in comments using whatever editor |
| 294 | 296 | is specified by your VISUAL or EDITOR environment variable. If none is |
| 295 | 297 | specified Fossil uses line-editing in the terminal. |
| 296 | 298 | |
| 297 | -To commit your changes to a repository that was cloned from remote you | |
| 298 | -perform the same actions but the results are different. Fossil | |
| 299 | -defaults to 'autosync' mode, a single-stage commit that sends all changes | |
| 300 | -committed to the local repository immediately on to the remote parent repository. This | |
| 301 | -only works if you have write permission to the remote respository. | |
| 299 | +To commit your changes to a repository that was cloned from a remote | |
| 300 | +repository, you give the same command, but the results are different. | |
| 301 | +Fossil defaults to [./concepts.wiki#workflow|autosync] mode, a | |
| 302 | +single-stage commit that sends all changes committed to the local | |
| 303 | +repository immediately on to the remote parent repository. This only | |
| 304 | +works if you have write permission to the remote respository. | |
| 302 | 305 | |
| 303 | 306 | <h2 id="naming">Naming of Files, Checkins, and Branches</h2> |
| 304 | 307 | |
| 305 | 308 | Fossil deals with information artifacts. This Quickstart document only deals |
| 306 | 309 | with files and collections of files, but be aware there are also tickets, wiki pages and more. |
| @@ -354,38 +357,10 @@ | ||
| 354 | 357 | should, change this after you create a few users. |
| 355 | 358 | |
| 356 | 359 | When you are finished configuring, just press Control-C or use |
| 357 | 360 | the <b>kill</b> command to shut down the mini-server. |
| 358 | 361 | |
| 359 | -<h2 id="changes">Making Changes</h2> | |
| 360 | - | |
| 361 | -To add new files to your project, or remove old files, use these | |
| 362 | -commands: | |
| 363 | - | |
| 364 | -<blockquote> | |
| 365 | -<b>[/help/add | fossil add]</b> <i>file...</i><br> | |
| 366 | -<b>[/help/rm | fossil rm]</b> <i>file...</i><br> | |
| 367 | -<b>[/help/addremove | fossil addremove]</b> <i>file...</i><br> | |
| 368 | -</blockquote> | |
| 369 | - | |
| 370 | -You can also edit files freely. Once you are ready to commit | |
| 371 | -your changes, type: | |
| 372 | - | |
| 373 | -<blockquote> | |
| 374 | -<b>[/help/commit | fossil commit]</b> | |
| 375 | -</blockquote> | |
| 376 | - | |
| 377 | -You will be prompted for check-in comments using whatever editor | |
| 378 | -is specified by your VISUAL or EDITOR environment variable. | |
| 379 | - | |
| 380 | -In the default configuration, the [/help/commit|commit] | |
| 381 | -command will also automatically [/help/push|push] your changes, but that | |
| 382 | -feature can be disabled. (More information about | |
| 383 | -[./concepts.wiki#workflow|autosync] and how to disable it.) | |
| 384 | -Remember that your coworkers can not see your changes until you | |
| 385 | -commit and push them. | |
| 386 | - | |
| 387 | 362 | <h2 id="sharing">Sharing Changes</h2> |
| 388 | 363 | |
| 389 | 364 | When [./concepts.wiki#workflow|autosync] is turned off, |
| 390 | 365 | the changes you [/help/commit | commit] are only |
| 391 | 366 | on your local repository. |
| 392 | 367 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -243,13 +243,15 @@ | |
| 243 | +Made some changes to the project<br> |
| 244 | # Original text<br> |
| 245 | </tt></b> |
| 246 | </blockquote> |
| 247 | |
| 248 | "fossil diff" is the difference between your tree on disk now and as the tree was |
| 249 | when you did "fossil open". An open is the first checkout from a repository |
| 250 | into a new directory. |
| 251 | |
| 252 | To see the most recent changes made to the repository by other users, use "fossil timeline" to |
| 253 | find out the most recent commit, and then "fossil diff" between that commit and the |
| 254 | current tree: |
| 255 | <blockquote> |
| @@ -292,15 +294,16 @@ | |
| 292 | |
| 293 | You will be prompted for check-in comments using whatever editor |
| 294 | is specified by your VISUAL or EDITOR environment variable. If none is |
| 295 | specified Fossil uses line-editing in the terminal. |
| 296 | |
| 297 | To commit your changes to a repository that was cloned from remote you |
| 298 | perform the same actions but the results are different. Fossil |
| 299 | defaults to 'autosync' mode, a single-stage commit that sends all changes |
| 300 | committed to the local repository immediately on to the remote parent repository. This |
| 301 | only works if you have write permission to the remote respository. |
| 302 | |
| 303 | <h2 id="naming">Naming of Files, Checkins, and Branches</h2> |
| 304 | |
| 305 | Fossil deals with information artifacts. This Quickstart document only deals |
| 306 | with files and collections of files, but be aware there are also tickets, wiki pages and more. |
| @@ -354,38 +357,10 @@ | |
| 354 | should, change this after you create a few users. |
| 355 | |
| 356 | When you are finished configuring, just press Control-C or use |
| 357 | the <b>kill</b> command to shut down the mini-server. |
| 358 | |
| 359 | <h2 id="changes">Making Changes</h2> |
| 360 | |
| 361 | To add new files to your project, or remove old files, use these |
| 362 | commands: |
| 363 | |
| 364 | <blockquote> |
| 365 | <b>[/help/add | fossil add]</b> <i>file...</i><br> |
| 366 | <b>[/help/rm | fossil rm]</b> <i>file...</i><br> |
| 367 | <b>[/help/addremove | fossil addremove]</b> <i>file...</i><br> |
| 368 | </blockquote> |
| 369 | |
| 370 | You can also edit files freely. Once you are ready to commit |
| 371 | your changes, type: |
| 372 | |
| 373 | <blockquote> |
| 374 | <b>[/help/commit | fossil commit]</b> |
| 375 | </blockquote> |
| 376 | |
| 377 | You will be prompted for check-in comments using whatever editor |
| 378 | is specified by your VISUAL or EDITOR environment variable. |
| 379 | |
| 380 | In the default configuration, the [/help/commit|commit] |
| 381 | command will also automatically [/help/push|push] your changes, but that |
| 382 | feature can be disabled. (More information about |
| 383 | [./concepts.wiki#workflow|autosync] and how to disable it.) |
| 384 | Remember that your coworkers can not see your changes until you |
| 385 | commit and push them. |
| 386 | |
| 387 | <h2 id="sharing">Sharing Changes</h2> |
| 388 | |
| 389 | When [./concepts.wiki#workflow|autosync] is turned off, |
| 390 | the changes you [/help/commit | commit] are only |
| 391 | on your local repository. |
| 392 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -243,13 +243,15 @@ | |
| 243 | +Made some changes to the project<br> |
| 244 | # Original text<br> |
| 245 | </tt></b> |
| 246 | </blockquote> |
| 247 | |
| 248 | "fossil diff" shows the difference between your tree on disk now and as |
| 249 | the tree was when you last committed changes. If you haven't committed |
| 250 | yet, then it shows the difference relative to the tip-of-trunk commit in |
| 251 | the repository, being what you get when you "fossil open" a repository |
| 252 | without specifying a version, populating the working directory. |
| 253 | |
| 254 | To see the most recent changes made to the repository by other users, use "fossil timeline" to |
| 255 | find out the most recent commit, and then "fossil diff" between that commit and the |
| 256 | current tree: |
| 257 | <blockquote> |
| @@ -292,15 +294,16 @@ | |
| 294 | |
| 295 | You will be prompted for check-in comments using whatever editor |
| 296 | is specified by your VISUAL or EDITOR environment variable. If none is |
| 297 | specified Fossil uses line-editing in the terminal. |
| 298 | |
| 299 | To commit your changes to a repository that was cloned from a remote |
| 300 | repository, you give the same command, but the results are different. |
| 301 | Fossil defaults to [./concepts.wiki#workflow|autosync] mode, a |
| 302 | single-stage commit that sends all changes committed to the local |
| 303 | repository immediately on to the remote parent repository. This only |
| 304 | works if you have write permission to the remote respository. |
| 305 | |
| 306 | <h2 id="naming">Naming of Files, Checkins, and Branches</h2> |
| 307 | |
| 308 | Fossil deals with information artifacts. This Quickstart document only deals |
| 309 | with files and collections of files, but be aware there are also tickets, wiki pages and more. |
| @@ -354,38 +357,10 @@ | |
| 357 | should, change this after you create a few users. |
| 358 | |
| 359 | When you are finished configuring, just press Control-C or use |
| 360 | the <b>kill</b> command to shut down the mini-server. |
| 361 | |
| 362 | <h2 id="sharing">Sharing Changes</h2> |
| 363 | |
| 364 | When [./concepts.wiki#workflow|autosync] is turned off, |
| 365 | the changes you [/help/commit | commit] are only |
| 366 | on your local repository. |
| 367 |