Fossil SCM
Fixed various typos and omissions in help sections
Commit
44b02c3de9593d50035dfcff261525c0b04cf501
Parent
93d7f371cc94693…
14 files changed
+4
+1
-1
+1
-1
+3
-3
+1
-1
+1
-1
+1
-1
+2
-2
+4
-2
+1
-1
+1
-1
+1
-1
+7
-3
+1
-1
+4
| --- src/allrepo.c | ||
| +++ src/allrepo.c | ||
| @@ -54,10 +54,14 @@ | ||
| 54 | 54 | ** Usage: %fossil all (list|ls|pull|push|rebuild|sync) |
| 55 | 55 | ** |
| 56 | 56 | ** The ~/.fossil file records the location of all repositories for a |
| 57 | 57 | ** user. This command performs certain operations on all repositories |
| 58 | 58 | ** that can be useful before or after a period of disconnection operation. |
| 59 | +** | |
| 60 | +** On Win32 systems, this file is located in %LOCALAPPDATA%, %APDDATA% | |
| 61 | +** or %HOMEPATH% and is named _fossil. | |
| 62 | +** | |
| 59 | 63 | ** Available operations are: |
| 60 | 64 | ** |
| 61 | 65 | ** list | ls Display the location of all repositories |
| 62 | 66 | ** |
| 63 | 67 | ** pull Run a "pull" operation on all repositories |
| 64 | 68 |
| --- src/allrepo.c | |
| +++ src/allrepo.c | |
| @@ -54,10 +54,14 @@ | |
| 54 | ** Usage: %fossil all (list|ls|pull|push|rebuild|sync) |
| 55 | ** |
| 56 | ** The ~/.fossil file records the location of all repositories for a |
| 57 | ** user. This command performs certain operations on all repositories |
| 58 | ** that can be useful before or after a period of disconnection operation. |
| 59 | ** Available operations are: |
| 60 | ** |
| 61 | ** list | ls Display the location of all repositories |
| 62 | ** |
| 63 | ** pull Run a "pull" operation on all repositories |
| 64 |
| --- src/allrepo.c | |
| +++ src/allrepo.c | |
| @@ -54,10 +54,14 @@ | |
| 54 | ** Usage: %fossil all (list|ls|pull|push|rebuild|sync) |
| 55 | ** |
| 56 | ** The ~/.fossil file records the location of all repositories for a |
| 57 | ** user. This command performs certain operations on all repositories |
| 58 | ** that can be useful before or after a period of disconnection operation. |
| 59 | ** |
| 60 | ** On Win32 systems, this file is located in %LOCALAPPDATA%, %APDDATA% |
| 61 | ** or %HOMEPATH% and is named _fossil. |
| 62 | ** |
| 63 | ** Available operations are: |
| 64 | ** |
| 65 | ** list | ls Display the location of all repositories |
| 66 | ** |
| 67 | ** pull Run a "pull" operation on all repositories |
| 68 |
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -529,11 +529,11 @@ | ||
| 529 | 529 | ** The editor defined in the "editor" fossil option (see %fossil help set) |
| 530 | 530 | ** will be used, or from the "VISUAL" or "EDITOR" environment variables |
| 531 | 531 | ** (in that order) if no editor is set. |
| 532 | 532 | ** |
| 533 | 533 | ** You will be prompted for your GPG passphrase in order to sign the |
| 534 | -** new manifest unless the "--nosign" options is used. All files that | |
| 534 | +** new manifest unless the "--nosign" option is used. All files that | |
| 535 | 535 | ** have changed will be committed unless some subset of files is |
| 536 | 536 | ** specified on the command line. |
| 537 | 537 | ** |
| 538 | 538 | ** The --branch option followed by a branch name cases the new check-in |
| 539 | 539 | ** to be placed in the named branch. The --bgcolor option can be followed |
| 540 | 540 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -529,11 +529,11 @@ | |
| 529 | ** The editor defined in the "editor" fossil option (see %fossil help set) |
| 530 | ** will be used, or from the "VISUAL" or "EDITOR" environment variables |
| 531 | ** (in that order) if no editor is set. |
| 532 | ** |
| 533 | ** You will be prompted for your GPG passphrase in order to sign the |
| 534 | ** new manifest unless the "--nosign" options is used. All files that |
| 535 | ** have changed will be committed unless some subset of files is |
| 536 | ** specified on the command line. |
| 537 | ** |
| 538 | ** The --branch option followed by a branch name cases the new check-in |
| 539 | ** to be placed in the named branch. The --bgcolor option can be followed |
| 540 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -529,11 +529,11 @@ | |
| 529 | ** The editor defined in the "editor" fossil option (see %fossil help set) |
| 530 | ** will be used, or from the "VISUAL" or "EDITOR" environment variables |
| 531 | ** (in that order) if no editor is set. |
| 532 | ** |
| 533 | ** You will be prompted for your GPG passphrase in order to sign the |
| 534 | ** new manifest unless the "--nosign" option is used. All files that |
| 535 | ** have changed will be committed unless some subset of files is |
| 536 | ** specified on the command line. |
| 537 | ** |
| 538 | ** The --branch option followed by a branch name cases the new check-in |
| 539 | ** to be placed in the named branch. The --bgcolor option can be followed |
| 540 |
+1
-1
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -367,11 +367,11 @@ | ||
| 367 | 367 | |
| 368 | 368 | |
| 369 | 369 | /* |
| 370 | 370 | ** COMMAND: configuration |
| 371 | 371 | ** |
| 372 | -** Usage: %fossil configure METHOD ... | |
| 372 | +** Usage: %fossil configure METHOD ... ?-R|--repository REPOSITORY? | |
| 373 | 373 | ** |
| 374 | 374 | ** Where METHOD is one of: export import merge pull push reset. All methods |
| 375 | 375 | ** accept the -R or --repository option to specific a repository. |
| 376 | 376 | ** |
| 377 | 377 | ** %fossil configuration export AREA FILENAME |
| 378 | 378 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -367,11 +367,11 @@ | |
| 367 | |
| 368 | |
| 369 | /* |
| 370 | ** COMMAND: configuration |
| 371 | ** |
| 372 | ** Usage: %fossil configure METHOD ... |
| 373 | ** |
| 374 | ** Where METHOD is one of: export import merge pull push reset. All methods |
| 375 | ** accept the -R or --repository option to specific a repository. |
| 376 | ** |
| 377 | ** %fossil configuration export AREA FILENAME |
| 378 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -367,11 +367,11 @@ | |
| 367 | |
| 368 | |
| 369 | /* |
| 370 | ** COMMAND: configuration |
| 371 | ** |
| 372 | ** Usage: %fossil configure METHOD ... ?-R|--repository REPOSITORY? |
| 373 | ** |
| 374 | ** Where METHOD is one of: export import merge pull push reset. All methods |
| 375 | ** accept the -R or --repository option to specific a repository. |
| 376 | ** |
| 377 | ** %fossil configuration export AREA FILENAME |
| 378 |
M
src/db.c
+3
-3
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1484,14 +1484,14 @@ | ||
| 1484 | 1484 | |
| 1485 | 1485 | |
| 1486 | 1486 | /* |
| 1487 | 1487 | ** COMMAND: settings |
| 1488 | 1488 | ** COMMAND: unset |
| 1489 | -** %fossil setting ?PROPERTY? ?VALUE? ?-global? | |
| 1489 | +** %fossil settings ?PROPERTY? ?VALUE? ?-global? | |
| 1490 | 1490 | ** %fossil unset PROPERTY ?-global? |
| 1491 | 1491 | ** |
| 1492 | -** The "setting" command with no arguments lists all properties and their | |
| 1492 | +** The "settings" command with no arguments lists all properties and their | |
| 1493 | 1493 | ** values. With just a property name it shows the value of that property. |
| 1494 | 1494 | ** With a value argument it changes the property for the current repository. |
| 1495 | 1495 | ** |
| 1496 | 1496 | ** The "unset" command clears a property setting. |
| 1497 | 1497 | ** |
| @@ -1502,11 +1502,11 @@ | ||
| 1502 | 1502 | ** auto-shun If enabled, automatically pull the shunning list |
| 1503 | 1503 | ** from a server to which the client autosyncs. |
| 1504 | 1504 | ** |
| 1505 | 1505 | ** autosync If enabled, automatically pull prior to commit |
| 1506 | 1506 | ** or update and automatically push after commit or |
| 1507 | -** tag or branch creation. If the the value is "pullonly" | |
| 1507 | +** tag or branch creation. If the value is "pullonly" | |
| 1508 | 1508 | ** then only pull operations occur automatically. |
| 1509 | 1509 | ** |
| 1510 | 1510 | ** binary-glob The VALUE is a comma-separated list of GLOB patterns |
| 1511 | 1511 | ** that should be treated as binary files for merging |
| 1512 | 1512 | ** purposes. Example: *.xml |
| 1513 | 1513 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1484,14 +1484,14 @@ | |
| 1484 | |
| 1485 | |
| 1486 | /* |
| 1487 | ** COMMAND: settings |
| 1488 | ** COMMAND: unset |
| 1489 | ** %fossil setting ?PROPERTY? ?VALUE? ?-global? |
| 1490 | ** %fossil unset PROPERTY ?-global? |
| 1491 | ** |
| 1492 | ** The "setting" command with no arguments lists all properties and their |
| 1493 | ** values. With just a property name it shows the value of that property. |
| 1494 | ** With a value argument it changes the property for the current repository. |
| 1495 | ** |
| 1496 | ** The "unset" command clears a property setting. |
| 1497 | ** |
| @@ -1502,11 +1502,11 @@ | |
| 1502 | ** auto-shun If enabled, automatically pull the shunning list |
| 1503 | ** from a server to which the client autosyncs. |
| 1504 | ** |
| 1505 | ** autosync If enabled, automatically pull prior to commit |
| 1506 | ** or update and automatically push after commit or |
| 1507 | ** tag or branch creation. If the the value is "pullonly" |
| 1508 | ** then only pull operations occur automatically. |
| 1509 | ** |
| 1510 | ** binary-glob The VALUE is a comma-separated list of GLOB patterns |
| 1511 | ** that should be treated as binary files for merging |
| 1512 | ** purposes. Example: *.xml |
| 1513 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1484,14 +1484,14 @@ | |
| 1484 | |
| 1485 | |
| 1486 | /* |
| 1487 | ** COMMAND: settings |
| 1488 | ** COMMAND: unset |
| 1489 | ** %fossil settings ?PROPERTY? ?VALUE? ?-global? |
| 1490 | ** %fossil unset PROPERTY ?-global? |
| 1491 | ** |
| 1492 | ** The "settings" command with no arguments lists all properties and their |
| 1493 | ** values. With just a property name it shows the value of that property. |
| 1494 | ** With a value argument it changes the property for the current repository. |
| 1495 | ** |
| 1496 | ** The "unset" command clears a property setting. |
| 1497 | ** |
| @@ -1502,11 +1502,11 @@ | |
| 1502 | ** auto-shun If enabled, automatically pull the shunning list |
| 1503 | ** from a server to which the client autosyncs. |
| 1504 | ** |
| 1505 | ** autosync If enabled, automatically pull prior to commit |
| 1506 | ** or update and automatically push after commit or |
| 1507 | ** tag or branch creation. If the value is "pullonly" |
| 1508 | ** then only pull operations occur automatically. |
| 1509 | ** |
| 1510 | ** binary-glob The VALUE is a comma-separated list of GLOB patterns |
| 1511 | ** that should be treated as binary files for merging |
| 1512 | ** purposes. Example: *.xml |
| 1513 |
+1
-1
| --- src/finfo.c | ||
| +++ src/finfo.c | ||
| @@ -25,11 +25,11 @@ | ||
| 25 | 25 | ** |
| 26 | 26 | ** Usage: %fossil finfo FILENAME |
| 27 | 27 | ** |
| 28 | 28 | ** Print the change history for a single file. |
| 29 | 29 | ** |
| 30 | -** The "--limit N" and "--offset P" options limits the output to the first | |
| 30 | +** The "--limit N" and "--offset P" options limit the output to the first | |
| 31 | 31 | ** N changes after skipping P changes. |
| 32 | 32 | */ |
| 33 | 33 | void finfo_cmd(void){ |
| 34 | 34 | Stmt q; |
| 35 | 35 | int vid; |
| 36 | 36 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -25,11 +25,11 @@ | |
| 25 | ** |
| 26 | ** Usage: %fossil finfo FILENAME |
| 27 | ** |
| 28 | ** Print the change history for a single file. |
| 29 | ** |
| 30 | ** The "--limit N" and "--offset P" options limits the output to the first |
| 31 | ** N changes after skipping P changes. |
| 32 | */ |
| 33 | void finfo_cmd(void){ |
| 34 | Stmt q; |
| 35 | int vid; |
| 36 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -25,11 +25,11 @@ | |
| 25 | ** |
| 26 | ** Usage: %fossil finfo FILENAME |
| 27 | ** |
| 28 | ** Print the change history for a single file. |
| 29 | ** |
| 30 | ** The "--limit N" and "--offset P" options limit the output to the first |
| 31 | ** N changes after skipping P changes. |
| 32 | */ |
| 33 | void finfo_cmd(void){ |
| 34 | Stmt q; |
| 35 | int vid; |
| 36 |
+1
-1
| --- src/makeheaders.html | ||
| +++ src/makeheaders.html | ||
| @@ -116,11 +116,11 @@ | ||
| 116 | 116 | <ol> |
| 117 | 117 | <p><li> |
| 118 | 118 | In large codes with many source files, it becomes difficult to determine |
| 119 | 119 | which .h files should be included in which .c files. |
| 120 | 120 | <p><li> |
| 121 | -It is typically the case the a .h file will be forced to include | |
| 121 | +It is typically the case that a .h file will be forced to include | |
| 122 | 122 | another .h files, which in turn might include other .h files, |
| 123 | 123 | and so forth. |
| 124 | 124 | The .c file must be recompiled when any of the .h files in this chain |
| 125 | 125 | are altered, but it can be difficult to determine what .h files are found |
| 126 | 126 | in the include chain. |
| 127 | 127 |
| --- src/makeheaders.html | |
| +++ src/makeheaders.html | |
| @@ -116,11 +116,11 @@ | |
| 116 | <ol> |
| 117 | <p><li> |
| 118 | In large codes with many source files, it becomes difficult to determine |
| 119 | which .h files should be included in which .c files. |
| 120 | <p><li> |
| 121 | It is typically the case the a .h file will be forced to include |
| 122 | another .h files, which in turn might include other .h files, |
| 123 | and so forth. |
| 124 | The .c file must be recompiled when any of the .h files in this chain |
| 125 | are altered, but it can be difficult to determine what .h files are found |
| 126 | in the include chain. |
| 127 |
| --- src/makeheaders.html | |
| +++ src/makeheaders.html | |
| @@ -116,11 +116,11 @@ | |
| 116 | <ol> |
| 117 | <p><li> |
| 118 | In large codes with many source files, it becomes difficult to determine |
| 119 | which .h files should be included in which .c files. |
| 120 | <p><li> |
| 121 | It is typically the case that a .h file will be forced to include |
| 122 | another .h files, which in turn might include other .h files, |
| 123 | and so forth. |
| 124 | The .c file must be recompiled when any of the .h files in this chain |
| 125 | are altered, but it can be difficult to determine what .h files are found |
| 126 | in the include chain. |
| 127 |
+1
-1
| --- src/rebuild.c | ||
| +++ src/rebuild.c | ||
| @@ -163,11 +163,11 @@ | ||
| 163 | 163 | bag_clear(&children); |
| 164 | 164 | rebuild_step_done(rid); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /* |
| 168 | -** Check to see if the the "sym-trunk" tag exists. If not, create it | |
| 168 | +** Check to see if the "sym-trunk" tag exists. If not, create it | |
| 169 | 169 | ** and attach it to the very first check-in. |
| 170 | 170 | */ |
| 171 | 171 | static void rebuild_tag_trunk(void){ |
| 172 | 172 | int tagid = db_int(0, "SELECT 1 FROM tag WHERE tagname='sym-trunk'"); |
| 173 | 173 | int rid; |
| 174 | 174 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -163,11 +163,11 @@ | |
| 163 | bag_clear(&children); |
| 164 | rebuild_step_done(rid); |
| 165 | } |
| 166 | |
| 167 | /* |
| 168 | ** Check to see if the the "sym-trunk" tag exists. If not, create it |
| 169 | ** and attach it to the very first check-in. |
| 170 | */ |
| 171 | static void rebuild_tag_trunk(void){ |
| 172 | int tagid = db_int(0, "SELECT 1 FROM tag WHERE tagname='sym-trunk'"); |
| 173 | int rid; |
| 174 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -163,11 +163,11 @@ | |
| 163 | bag_clear(&children); |
| 164 | rebuild_step_done(rid); |
| 165 | } |
| 166 | |
| 167 | /* |
| 168 | ** Check to see if the "sym-trunk" tag exists. If not, create it |
| 169 | ** and attach it to the very first check-in. |
| 170 | */ |
| 171 | static void rebuild_tag_trunk(void){ |
| 172 | int tagid = db_int(0, "SELECT 1 FROM tag WHERE tagname='sym-trunk'"); |
| 173 | int rid; |
| 174 |
+2
-2
| --- src/undo.c | ||
| +++ src/undo.c | ||
| @@ -126,11 +126,11 @@ | ||
| 126 | 126 | db_lset_int("undo_checkout", ucid); |
| 127 | 127 | db_lset_int("checkout", ncid); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /* |
| 131 | -** Reset the the undo memory. | |
| 131 | +** Reset the undo memory. | |
| 132 | 132 | */ |
| 133 | 133 | void undo_reset(void){ |
| 134 | 134 | static const char zSql[] = |
| 135 | 135 | @ DROP TABLE IF EXISTS undo; |
| 136 | 136 | @ DROP TABLE IF EXISTS undo_vfile; |
| @@ -283,11 +283,11 @@ | ||
| 283 | 283 | /* |
| 284 | 284 | ** COMMAND: redo |
| 285 | 285 | ** |
| 286 | 286 | ** Usage: %fossil redo ?FILENAME...? |
| 287 | 287 | ** |
| 288 | -** Redo the an update or merge or revert operation that has been undone | |
| 288 | +** Redo an update or merge or revert operation that has been undone | |
| 289 | 289 | ** by the undo command. If FILENAME is specified then restore the changes |
| 290 | 290 | ** associated with the named file(s) but otherwise leave the update |
| 291 | 291 | ** or merge undone. |
| 292 | 292 | ** |
| 293 | 293 | ** A single level of undo/redo is supported. The undo/redo stack |
| 294 | 294 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -126,11 +126,11 @@ | |
| 126 | db_lset_int("undo_checkout", ucid); |
| 127 | db_lset_int("checkout", ncid); |
| 128 | } |
| 129 | |
| 130 | /* |
| 131 | ** Reset the the undo memory. |
| 132 | */ |
| 133 | void undo_reset(void){ |
| 134 | static const char zSql[] = |
| 135 | @ DROP TABLE IF EXISTS undo; |
| 136 | @ DROP TABLE IF EXISTS undo_vfile; |
| @@ -283,11 +283,11 @@ | |
| 283 | /* |
| 284 | ** COMMAND: redo |
| 285 | ** |
| 286 | ** Usage: %fossil redo ?FILENAME...? |
| 287 | ** |
| 288 | ** Redo the an update or merge or revert operation that has been undone |
| 289 | ** by the undo command. If FILENAME is specified then restore the changes |
| 290 | ** associated with the named file(s) but otherwise leave the update |
| 291 | ** or merge undone. |
| 292 | ** |
| 293 | ** A single level of undo/redo is supported. The undo/redo stack |
| 294 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -126,11 +126,11 @@ | |
| 126 | db_lset_int("undo_checkout", ucid); |
| 127 | db_lset_int("checkout", ncid); |
| 128 | } |
| 129 | |
| 130 | /* |
| 131 | ** Reset the undo memory. |
| 132 | */ |
| 133 | void undo_reset(void){ |
| 134 | static const char zSql[] = |
| 135 | @ DROP TABLE IF EXISTS undo; |
| 136 | @ DROP TABLE IF EXISTS undo_vfile; |
| @@ -283,11 +283,11 @@ | |
| 283 | /* |
| 284 | ** COMMAND: redo |
| 285 | ** |
| 286 | ** Usage: %fossil redo ?FILENAME...? |
| 287 | ** |
| 288 | ** Redo an update or merge or revert operation that has been undone |
| 289 | ** by the undo command. If FILENAME is specified then restore the changes |
| 290 | ** associated with the named file(s) but otherwise leave the update |
| 291 | ** or merge undone. |
| 292 | ** |
| 293 | ** A single level of undo/redo is supported. The undo/redo stack |
| 294 |
+4
-2
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -36,11 +36,11 @@ | ||
| 36 | 36 | ** |
| 37 | 37 | ** Change the version of the current checkout to VERSION. Any uncommitted |
| 38 | 38 | ** changes are retained and applied to the new checkout. |
| 39 | 39 | ** |
| 40 | 40 | ** The VERSION argument can be a specific version or tag or branch name. |
| 41 | -** If the VERSION argument is omitted, then the leaf of the the subtree | |
| 41 | +** If the VERSION argument is omitted, then the leaf of the subtree | |
| 42 | 42 | ** that begins at the current version is used, if there is only a single |
| 43 | 43 | ** leaf. VERSION can also be "current" to select the leaf of the current |
| 44 | 44 | ** version or "latest" to select the most recent check-in. |
| 45 | 45 | ** |
| 46 | 46 | ** If one or more FILES are listed after the VERSION then only the |
| @@ -335,15 +335,17 @@ | ||
| 335 | 335 | |
| 336 | 336 | |
| 337 | 337 | /* |
| 338 | 338 | ** COMMAND: revert |
| 339 | 339 | ** |
| 340 | -** Usage: %fossil revert ?-r REVISION? FILE ... | |
| 340 | +** Usage: %fossil revert ?-r REVISION? ?FILE ...? | |
| 341 | 341 | ** |
| 342 | 342 | ** Revert to the current repository version of FILE, or to |
| 343 | 343 | ** the version associated with baseline REVISION if the -r flag |
| 344 | 344 | ** appears. |
| 345 | +** | |
| 346 | +** Revert all files if no file name is provided. | |
| 345 | 347 | ** |
| 346 | 348 | ** If a file is reverted accidently, it can be restored using |
| 347 | 349 | ** the "fossil undo" command. |
| 348 | 350 | */ |
| 349 | 351 | void revert_cmd(void){ |
| 350 | 352 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -36,11 +36,11 @@ | |
| 36 | ** |
| 37 | ** Change the version of the current checkout to VERSION. Any uncommitted |
| 38 | ** changes are retained and applied to the new checkout. |
| 39 | ** |
| 40 | ** The VERSION argument can be a specific version or tag or branch name. |
| 41 | ** If the VERSION argument is omitted, then the leaf of the the subtree |
| 42 | ** that begins at the current version is used, if there is only a single |
| 43 | ** leaf. VERSION can also be "current" to select the leaf of the current |
| 44 | ** version or "latest" to select the most recent check-in. |
| 45 | ** |
| 46 | ** If one or more FILES are listed after the VERSION then only the |
| @@ -335,15 +335,17 @@ | |
| 335 | |
| 336 | |
| 337 | /* |
| 338 | ** COMMAND: revert |
| 339 | ** |
| 340 | ** Usage: %fossil revert ?-r REVISION? FILE ... |
| 341 | ** |
| 342 | ** Revert to the current repository version of FILE, or to |
| 343 | ** the version associated with baseline REVISION if the -r flag |
| 344 | ** appears. |
| 345 | ** |
| 346 | ** If a file is reverted accidently, it can be restored using |
| 347 | ** the "fossil undo" command. |
| 348 | */ |
| 349 | void revert_cmd(void){ |
| 350 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -36,11 +36,11 @@ | |
| 36 | ** |
| 37 | ** Change the version of the current checkout to VERSION. Any uncommitted |
| 38 | ** changes are retained and applied to the new checkout. |
| 39 | ** |
| 40 | ** The VERSION argument can be a specific version or tag or branch name. |
| 41 | ** If the VERSION argument is omitted, then the leaf of the subtree |
| 42 | ** that begins at the current version is used, if there is only a single |
| 43 | ** leaf. VERSION can also be "current" to select the leaf of the current |
| 44 | ** version or "latest" to select the most recent check-in. |
| 45 | ** |
| 46 | ** If one or more FILES are listed after the VERSION then only the |
| @@ -335,15 +335,17 @@ | |
| 335 | |
| 336 | |
| 337 | /* |
| 338 | ** COMMAND: revert |
| 339 | ** |
| 340 | ** Usage: %fossil revert ?-r REVISION? ?FILE ...? |
| 341 | ** |
| 342 | ** Revert to the current repository version of FILE, or to |
| 343 | ** the version associated with baseline REVISION if the -r flag |
| 344 | ** appears. |
| 345 | ** |
| 346 | ** Revert all files if no file name is provided. |
| 347 | ** |
| 348 | ** If a file is reverted accidently, it can be restored using |
| 349 | ** the "fossil undo" command. |
| 350 | */ |
| 351 | void revert_cmd(void){ |
| 352 |
+1
-1
| --- www/branching.wiki | ||
| +++ www/branching.wiki | ||
| @@ -104,11 +104,11 @@ | ||
| 104 | 104 | of Bob's local checkout before he merged in Alice's changes. That snapshot |
| 105 | 105 | of Bob's changes independent of Alice's changes is omitted from figure 1. |
| 106 | 106 | Some people say that the approach taken in figure 3 is better because it |
| 107 | 107 | preserves this extra intermediate state. Others say that the approach |
| 108 | 108 | taken in figure 1 is better because it is much easier to visualize a |
| 109 | -linear line of development and because the the merging happens automatically | |
| 109 | +linear line of development and because the merging happens automatically | |
| 110 | 110 | instead of as a separate manual step. We will not take sides in that |
| 111 | 111 | debate. We will simply point out that fossil enables you to do it either way. |
| 112 | 112 | |
| 113 | 113 | <h2>Forking Versus Branching</h2> |
| 114 | 114 | |
| 115 | 115 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -104,11 +104,11 @@ | |
| 104 | of Bob's local checkout before he merged in Alice's changes. That snapshot |
| 105 | of Bob's changes independent of Alice's changes is omitted from figure 1. |
| 106 | Some people say that the approach taken in figure 3 is better because it |
| 107 | preserves this extra intermediate state. Others say that the approach |
| 108 | taken in figure 1 is better because it is much easier to visualize a |
| 109 | linear line of development and because the the merging happens automatically |
| 110 | instead of as a separate manual step. We will not take sides in that |
| 111 | debate. We will simply point out that fossil enables you to do it either way. |
| 112 | |
| 113 | <h2>Forking Versus Branching</h2> |
| 114 | |
| 115 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -104,11 +104,11 @@ | |
| 104 | of Bob's local checkout before he merged in Alice's changes. That snapshot |
| 105 | of Bob's changes independent of Alice's changes is omitted from figure 1. |
| 106 | Some people say that the approach taken in figure 3 is better because it |
| 107 | preserves this extra intermediate state. Others say that the approach |
| 108 | taken in figure 1 is better because it is much easier to visualize a |
| 109 | linear line of development and because the merging happens automatically |
| 110 | instead of as a separate manual step. We will not take sides in that |
| 111 | debate. We will simply point out that fossil enables you to do it either way. |
| 112 | |
| 113 | <h2>Forking Versus Branching</h2> |
| 114 | |
| 115 |
+1
-1
| --- www/fileformat.wiki | ||
| +++ www/fileformat.wiki | ||
| @@ -163,11 +163,11 @@ | ||
| 163 | 163 | the manifest itself) in strict sorted lexicographical order, |
| 164 | 164 | take the pathname of the file relative to the root of the |
| 165 | 165 | repository, append a single space (ASCII 0x20), the |
| 166 | 166 | size of the file in ASCII decimal, a single newline |
| 167 | 167 | character (ASCII 0x0A), and the complete text of the file. |
| 168 | -Compute the MD5 checksum of the the result. | |
| 168 | +Compute the MD5 checksum of the result. | |
| 169 | 169 | |
| 170 | 170 | A manifest might contain one or more T-cards used to set tags or |
| 171 | 171 | properties on the check-in. The format of the T-card is the same as |
| 172 | 172 | described in <i>Control Artifacts</i> section below, except that the |
| 173 | 173 | second argument is the single characcter "<b>*</b>" instead of an |
| 174 | 174 |
| --- www/fileformat.wiki | |
| +++ www/fileformat.wiki | |
| @@ -163,11 +163,11 @@ | |
| 163 | the manifest itself) in strict sorted lexicographical order, |
| 164 | take the pathname of the file relative to the root of the |
| 165 | repository, append a single space (ASCII 0x20), the |
| 166 | size of the file in ASCII decimal, a single newline |
| 167 | character (ASCII 0x0A), and the complete text of the file. |
| 168 | Compute the MD5 checksum of the the result. |
| 169 | |
| 170 | A manifest might contain one or more T-cards used to set tags or |
| 171 | properties on the check-in. The format of the T-card is the same as |
| 172 | described in <i>Control Artifacts</i> section below, except that the |
| 173 | second argument is the single characcter "<b>*</b>" instead of an |
| 174 |
| --- www/fileformat.wiki | |
| +++ www/fileformat.wiki | |
| @@ -163,11 +163,11 @@ | |
| 163 | the manifest itself) in strict sorted lexicographical order, |
| 164 | take the pathname of the file relative to the root of the |
| 165 | repository, append a single space (ASCII 0x20), the |
| 166 | size of the file in ASCII decimal, a single newline |
| 167 | character (ASCII 0x0A), and the complete text of the file. |
| 168 | Compute the MD5 checksum of the result. |
| 169 | |
| 170 | A manifest might contain one or more T-cards used to set tags or |
| 171 | properties on the check-in. The format of the T-card is the same as |
| 172 | described in <i>Control Artifacts</i> section below, except that the |
| 173 | second argument is the single characcter "<b>*</b>" instead of an |
| 174 |
+1
-1
| --- www/newrepo.wiki | ||
| +++ www/newrepo.wiki | ||
| @@ -159,6 +159,6 @@ | ||
| 159 | 159 | via the Admin/Users page mentioned above). |
| 160 | 160 | |
| 161 | 161 | You may always use the <em>server</em> or <em>ui</em> commands to |
| 162 | 162 | browse a cloned repository. You can even edit create or wiki entries, |
| 163 | 163 | etc., and they will be pushed to the remote side the next time you |
| 164 | -push data to the the remote. | |
| 164 | +push data to the remote. | |
| 165 | 165 |
| --- www/newrepo.wiki | |
| +++ www/newrepo.wiki | |
| @@ -159,6 +159,6 @@ | |
| 159 | via the Admin/Users page mentioned above). |
| 160 | |
| 161 | You may always use the <em>server</em> or <em>ui</em> commands to |
| 162 | browse a cloned repository. You can even edit create or wiki entries, |
| 163 | etc., and they will be pushed to the remote side the next time you |
| 164 | push data to the the remote. |
| 165 |
| --- www/newrepo.wiki | |
| +++ www/newrepo.wiki | |
| @@ -159,6 +159,6 @@ | |
| 159 | via the Admin/Users page mentioned above). |
| 160 | |
| 161 | You may always use the <em>server</em> or <em>ui</em> commands to |
| 162 | browse a cloned repository. You can even edit create or wiki entries, |
| 163 | etc., and they will be pushed to the remote side the next time you |
| 164 | push data to the remote. |
| 165 |
+7
-3
| --- www/reference.wiki | ||
| +++ www/reference.wiki | ||
| @@ -143,10 +143,14 @@ | ||
| 143 | 143 | <hr><a href="#tof">ˆ</a> |
| 144 | 144 | <a name="all">Usage: </a><code><a href="cmd_all.wiki">fossil all</a></code> (list|pull|push|rebuild|sync) |
| 145 | 145 | The ~/.fossil file records the location of all repositories for a |
| 146 | 146 | user. This command performs certain operations on all repositories |
| 147 | 147 | that can be useful before or after a period of disconnection operation. |
| 148 | + | |
| 149 | + On Win32 systems, this file is located in %LOCALAPPDATA%, %APDDATA% | |
| 150 | + or %HOMEPATH% and is named _fossil. | |
| 151 | + | |
| 148 | 152 | Available operations are: |
| 149 | 153 | |
| 150 | 154 | list Display the location of all repositories |
| 151 | 155 | |
| 152 | 156 | pull Run a "pull" operation on all repositories |
| @@ -209,11 +213,11 @@ | ||
| 209 | 213 | |
| 210 | 214 | Create a new version containing all of the changes in the current |
| 211 | 215 | checkout. You will be prompted to enter a check-in comment unless |
| 212 | 216 | the "-m" option is used to specify a comment line. You will be |
| 213 | 217 | prompted for your GPG passphrase in order to sign the new manifest |
| 214 | - unless the "--nosign" options is used. All files that have | |
| 218 | + unless the "--nosign" option is used. All files that have | |
| 215 | 219 | changed will be committed unless some subset of files is specified |
| 216 | 220 | on the command line. |
| 217 | 221 | |
| 218 | 222 | <hr><a href="#tof">ˆ</a> |
| 219 | 223 | <a name="clean">Usage: </a><a href="cmd_clean.wiki">fossil clean</a> ?-all? |
| @@ -450,14 +454,14 @@ | ||
| 450 | 454 | the web server. |
| 451 | 455 | |
| 452 | 456 | <hr><a href="#tof">ˆ</a> |
| 453 | 457 | COMMAND: settings |
| 454 | 458 | COMMAND: unset |
| 455 | - <a name="setting">Usage: </a><a href="cmd_setting.wiki">fossil setting</a> ?PROPERTY? ?VALUE? ?-global? | |
| 459 | + <a name="settings">Usage: </a><a href="cmd_setting.wiki">fossil settings</a> ?PROPERTY? ?VALUE? ?-global? | |
| 456 | 460 | fossil unset PROPERTY ?-global? |
| 457 | 461 | |
| 458 | - The "setting" command with no arguments lists all properties and their | |
| 462 | + The "settings" command with no arguments lists all properties and their | |
| 459 | 463 | values. With just a property name it shows the value of that property. |
| 460 | 464 | With a value argument it changes the property for the current repository. |
| 461 | 465 | |
| 462 | 466 | The "unset" command clears a property setting. |
| 463 | 467 | |
| 464 | 468 |
| --- www/reference.wiki | |
| +++ www/reference.wiki | |
| @@ -143,10 +143,14 @@ | |
| 143 | <hr><a href="#tof">ˆ</a> |
| 144 | <a name="all">Usage: </a><code><a href="cmd_all.wiki">fossil all</a></code> (list|pull|push|rebuild|sync) |
| 145 | The ~/.fossil file records the location of all repositories for a |
| 146 | user. This command performs certain operations on all repositories |
| 147 | that can be useful before or after a period of disconnection operation. |
| 148 | Available operations are: |
| 149 | |
| 150 | list Display the location of all repositories |
| 151 | |
| 152 | pull Run a "pull" operation on all repositories |
| @@ -209,11 +213,11 @@ | |
| 209 | |
| 210 | Create a new version containing all of the changes in the current |
| 211 | checkout. You will be prompted to enter a check-in comment unless |
| 212 | the "-m" option is used to specify a comment line. You will be |
| 213 | prompted for your GPG passphrase in order to sign the new manifest |
| 214 | unless the "--nosign" options is used. All files that have |
| 215 | changed will be committed unless some subset of files is specified |
| 216 | on the command line. |
| 217 | |
| 218 | <hr><a href="#tof">ˆ</a> |
| 219 | <a name="clean">Usage: </a><a href="cmd_clean.wiki">fossil clean</a> ?-all? |
| @@ -450,14 +454,14 @@ | |
| 450 | the web server. |
| 451 | |
| 452 | <hr><a href="#tof">ˆ</a> |
| 453 | COMMAND: settings |
| 454 | COMMAND: unset |
| 455 | <a name="setting">Usage: </a><a href="cmd_setting.wiki">fossil setting</a> ?PROPERTY? ?VALUE? ?-global? |
| 456 | fossil unset PROPERTY ?-global? |
| 457 | |
| 458 | The "setting" command with no arguments lists all properties and their |
| 459 | values. With just a property name it shows the value of that property. |
| 460 | With a value argument it changes the property for the current repository. |
| 461 | |
| 462 | The "unset" command clears a property setting. |
| 463 | |
| 464 |
| --- www/reference.wiki | |
| +++ www/reference.wiki | |
| @@ -143,10 +143,14 @@ | |
| 143 | <hr><a href="#tof">ˆ</a> |
| 144 | <a name="all">Usage: </a><code><a href="cmd_all.wiki">fossil all</a></code> (list|pull|push|rebuild|sync) |
| 145 | The ~/.fossil file records the location of all repositories for a |
| 146 | user. This command performs certain operations on all repositories |
| 147 | that can be useful before or after a period of disconnection operation. |
| 148 | |
| 149 | On Win32 systems, this file is located in %LOCALAPPDATA%, %APDDATA% |
| 150 | or %HOMEPATH% and is named _fossil. |
| 151 | |
| 152 | Available operations are: |
| 153 | |
| 154 | list Display the location of all repositories |
| 155 | |
| 156 | pull Run a "pull" operation on all repositories |
| @@ -209,11 +213,11 @@ | |
| 213 | |
| 214 | Create a new version containing all of the changes in the current |
| 215 | checkout. You will be prompted to enter a check-in comment unless |
| 216 | the "-m" option is used to specify a comment line. You will be |
| 217 | prompted for your GPG passphrase in order to sign the new manifest |
| 218 | unless the "--nosign" option is used. All files that have |
| 219 | changed will be committed unless some subset of files is specified |
| 220 | on the command line. |
| 221 | |
| 222 | <hr><a href="#tof">ˆ</a> |
| 223 | <a name="clean">Usage: </a><a href="cmd_clean.wiki">fossil clean</a> ?-all? |
| @@ -450,14 +454,14 @@ | |
| 454 | the web server. |
| 455 | |
| 456 | <hr><a href="#tof">ˆ</a> |
| 457 | COMMAND: settings |
| 458 | COMMAND: unset |
| 459 | <a name="settings">Usage: </a><a href="cmd_setting.wiki">fossil settings</a> ?PROPERTY? ?VALUE? ?-global? |
| 460 | fossil unset PROPERTY ?-global? |
| 461 | |
| 462 | The "settings" command with no arguments lists all properties and their |
| 463 | values. With just a property name it shows the value of that property. |
| 464 | With a value argument it changes the property for the current repository. |
| 465 | |
| 466 | The "unset" command clears a property setting. |
| 467 | |
| 468 |
+1
-1
| --- www/theory1.wiki | ||
| +++ www/theory1.wiki | ||
| @@ -74,11 +74,11 @@ | ||
| 74 | 74 | |
| 75 | 75 | Another way to think of the relational tables in a Fossil repository is |
| 76 | 76 | as an index for the artifacts. Without the relational tables, |
| 77 | 77 | to generate a report like a timeline would require scanning every artifact - |
| 78 | 78 | the equivalent of a full table scan. The relational tables hold pointers |
| 79 | -the the relevant artifacts in presorted order so that generating a timeline | |
| 79 | +the relevant artifacts in presorted order so that generating a timeline | |
| 80 | 80 | is much more efficient. So like an index in a relational database, the |
| 81 | 81 | relational tables in an Fossil repository do not add any new information, |
| 82 | 82 | they merely make the information in the artifacts faster and easier to |
| 83 | 83 | look up. |
| 84 | 84 | |
| 85 | 85 |
| --- www/theory1.wiki | |
| +++ www/theory1.wiki | |
| @@ -74,11 +74,11 @@ | |
| 74 | |
| 75 | Another way to think of the relational tables in a Fossil repository is |
| 76 | as an index for the artifacts. Without the relational tables, |
| 77 | to generate a report like a timeline would require scanning every artifact - |
| 78 | the equivalent of a full table scan. The relational tables hold pointers |
| 79 | the the relevant artifacts in presorted order so that generating a timeline |
| 80 | is much more efficient. So like an index in a relational database, the |
| 81 | relational tables in an Fossil repository do not add any new information, |
| 82 | they merely make the information in the artifacts faster and easier to |
| 83 | look up. |
| 84 | |
| 85 |
| --- www/theory1.wiki | |
| +++ www/theory1.wiki | |
| @@ -74,11 +74,11 @@ | |
| 74 | |
| 75 | Another way to think of the relational tables in a Fossil repository is |
| 76 | as an index for the artifacts. Without the relational tables, |
| 77 | to generate a report like a timeline would require scanning every artifact - |
| 78 | the equivalent of a full table scan. The relational tables hold pointers |
| 79 | the relevant artifacts in presorted order so that generating a timeline |
| 80 | is much more efficient. So like an index in a relational database, the |
| 81 | relational tables in an Fossil repository do not add any new information, |
| 82 | they merely make the information in the artifacts faster and easier to |
| 83 | look up. |
| 84 | |
| 85 |