Fossil SCM
Update and improve command help for 'mv', 'rm', et al.
Commit
27702f3cc97a1076e5bbb9608f724da767772dd2
Parent
78829b7089ac7a0…
1 file changed
+22
-8
+22
-8
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -421,17 +421,24 @@ | ||
| 421 | 421 | ** |
| 422 | 422 | ** Usage: %fossil rm|delete|forget FILE1 ?FILE2 ...? |
| 423 | 423 | ** |
| 424 | 424 | ** Remove one or more files or directories from the repository. |
| 425 | 425 | ** |
| 426 | -** This command does NOT normally remove the files from disk. It just | |
| 427 | -** marks the files as no longer being part of the project. In other | |
| 428 | -** words, future changes to the named files will not be versioned. | |
| 426 | +** The 'rm' and 'delete' commands do NOT normally remove the files from | |
| 427 | +** disk. They just mark the files as no longer being part of the project. | |
| 428 | +** In other words, future changes to the named files will not be versioned. | |
| 429 | +** However, the default behavior of this command may be overridden via the | |
| 430 | +** command line options listed below and/or the 'remove-files' setting. | |
| 431 | +** | |
| 432 | +** The 'forget' command never removes files from disk, even when the command | |
| 433 | +** line options and/or the 'remove-files' setting would otherwise require it | |
| 434 | +** to do so. | |
| 429 | 435 | ** |
| 430 | 436 | ** WARNING: If either the "--metadata-only 0" or "--hard" option is |
| 431 | 437 | ** specified -OR- the "remove-files" setting is non-zero, |
| 432 | -** files WILL BE removed from disk as well. | |
| 438 | +** files WILL BE removed from disk as well. This does NOT | |
| 439 | +** apply to the 'forget' command. | |
| 433 | 440 | ** |
| 434 | 441 | ** Options: |
| 435 | 442 | ** --metadata-only <BOOL> Non-zero to skip removing files from the |
| 436 | 443 | ** checkout. Supersedes both the --soft and |
| 437 | 444 | ** --hard options. |
| @@ -780,17 +787,24 @@ | ||
| 780 | 787 | ** or: %fossil mv|rename OLDNAME... DIR |
| 781 | 788 | ** |
| 782 | 789 | ** Move or rename one or more files or directories within the repository tree. |
| 783 | 790 | ** You can either rename a file or directory or move it to another subdirectory. |
| 784 | 791 | ** |
| 785 | -** This command does NOT normally rename or move the files on disk. This | |
| 786 | -** command merely records the fact that filenames have changed so that | |
| 787 | -** appropriate notations can be made at the next commit/check-in. | |
| 792 | +** The 'mv' command does NOT normally rename or move the files on disk. | |
| 793 | +** This command merely records the fact that file names have changed so | |
| 794 | +** that appropriate notations can be made at the next commit/check-in. | |
| 795 | +** However, the default behavior of this command may be overridden via | |
| 796 | +** command line options listed below and/or the 'move-files' setting. | |
| 797 | +** | |
| 798 | +** The 'rename' command never renames or moves files on disk, even when the | |
| 799 | +** command line options and/or the 'move-files' setting would otherwise | |
| 800 | +** require it to do so. | |
| 788 | 801 | ** |
| 789 | 802 | ** WARNING: If either the "--metadata-only 0" or "--hard" option is |
| 790 | 803 | ** specified -OR- the "move-files" setting is non-zero, |
| 791 | -** files WILL BE renamed or moved on disk as well. | |
| 804 | +** files WILL BE renamed or moved on disk as well. This does | |
| 805 | +** NOT apply to the 'rename' command. | |
| 792 | 806 | ** |
| 793 | 807 | ** Options: |
| 794 | 808 | ** --metadata-only <BOOL> Non-zero to skip moving files within the |
| 795 | 809 | ** checkout. Supersedes both the --soft and |
| 796 | 810 | ** --hard options. |
| 797 | 811 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -421,17 +421,24 @@ | |
| 421 | ** |
| 422 | ** Usage: %fossil rm|delete|forget FILE1 ?FILE2 ...? |
| 423 | ** |
| 424 | ** Remove one or more files or directories from the repository. |
| 425 | ** |
| 426 | ** This command does NOT normally remove the files from disk. It just |
| 427 | ** marks the files as no longer being part of the project. In other |
| 428 | ** words, future changes to the named files will not be versioned. |
| 429 | ** |
| 430 | ** WARNING: If either the "--metadata-only 0" or "--hard" option is |
| 431 | ** specified -OR- the "remove-files" setting is non-zero, |
| 432 | ** files WILL BE removed from disk as well. |
| 433 | ** |
| 434 | ** Options: |
| 435 | ** --metadata-only <BOOL> Non-zero to skip removing files from the |
| 436 | ** checkout. Supersedes both the --soft and |
| 437 | ** --hard options. |
| @@ -780,17 +787,24 @@ | |
| 780 | ** or: %fossil mv|rename OLDNAME... DIR |
| 781 | ** |
| 782 | ** Move or rename one or more files or directories within the repository tree. |
| 783 | ** You can either rename a file or directory or move it to another subdirectory. |
| 784 | ** |
| 785 | ** This command does NOT normally rename or move the files on disk. This |
| 786 | ** command merely records the fact that filenames have changed so that |
| 787 | ** appropriate notations can be made at the next commit/check-in. |
| 788 | ** |
| 789 | ** WARNING: If either the "--metadata-only 0" or "--hard" option is |
| 790 | ** specified -OR- the "move-files" setting is non-zero, |
| 791 | ** files WILL BE renamed or moved on disk as well. |
| 792 | ** |
| 793 | ** Options: |
| 794 | ** --metadata-only <BOOL> Non-zero to skip moving files within the |
| 795 | ** checkout. Supersedes both the --soft and |
| 796 | ** --hard options. |
| 797 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -421,17 +421,24 @@ | |
| 421 | ** |
| 422 | ** Usage: %fossil rm|delete|forget FILE1 ?FILE2 ...? |
| 423 | ** |
| 424 | ** Remove one or more files or directories from the repository. |
| 425 | ** |
| 426 | ** The 'rm' and 'delete' commands do NOT normally remove the files from |
| 427 | ** disk. They just mark the files as no longer being part of the project. |
| 428 | ** In other words, future changes to the named files will not be versioned. |
| 429 | ** However, the default behavior of this command may be overridden via the |
| 430 | ** command line options listed below and/or the 'remove-files' setting. |
| 431 | ** |
| 432 | ** The 'forget' command never removes files from disk, even when the command |
| 433 | ** line options and/or the 'remove-files' setting would otherwise require it |
| 434 | ** to do so. |
| 435 | ** |
| 436 | ** WARNING: If either the "--metadata-only 0" or "--hard" option is |
| 437 | ** specified -OR- the "remove-files" setting is non-zero, |
| 438 | ** files WILL BE removed from disk as well. This does NOT |
| 439 | ** apply to the 'forget' command. |
| 440 | ** |
| 441 | ** Options: |
| 442 | ** --metadata-only <BOOL> Non-zero to skip removing files from the |
| 443 | ** checkout. Supersedes both the --soft and |
| 444 | ** --hard options. |
| @@ -780,17 +787,24 @@ | |
| 787 | ** or: %fossil mv|rename OLDNAME... DIR |
| 788 | ** |
| 789 | ** Move or rename one or more files or directories within the repository tree. |
| 790 | ** You can either rename a file or directory or move it to another subdirectory. |
| 791 | ** |
| 792 | ** The 'mv' command does NOT normally rename or move the files on disk. |
| 793 | ** This command merely records the fact that file names have changed so |
| 794 | ** that appropriate notations can be made at the next commit/check-in. |
| 795 | ** However, the default behavior of this command may be overridden via |
| 796 | ** command line options listed below and/or the 'move-files' setting. |
| 797 | ** |
| 798 | ** The 'rename' command never renames or moves files on disk, even when the |
| 799 | ** command line options and/or the 'move-files' setting would otherwise |
| 800 | ** require it to do so. |
| 801 | ** |
| 802 | ** WARNING: If either the "--metadata-only 0" or "--hard" option is |
| 803 | ** specified -OR- the "move-files" setting is non-zero, |
| 804 | ** files WILL BE renamed or moved on disk as well. This does |
| 805 | ** NOT apply to the 'rename' command. |
| 806 | ** |
| 807 | ** Options: |
| 808 | ** --metadata-only <BOOL> Non-zero to skip moving files within the |
| 809 | ** checkout. Supersedes both the --soft and |
| 810 | ** --hard options. |
| 811 |