Fossil SCM
Update the open/checkout --keep flag help text to be more generic about the manifest files, to account for manifest.tags, (potentially) manifest.descr, and any future manifest.* files. No code changes.
Commit
ca2248ec2c97e47eb7237639b07cdc348ac05ac4d9175ffe41977728621bb445
Parent
c7b9f05f2e20846…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -278,11 +278,11 @@ | ||
| 278 | 278 | ** The --latest flag can be used in place of VERSION to checkout the |
| 279 | 279 | ** latest version in the repository. |
| 280 | 280 | ** |
| 281 | 281 | ** Options: |
| 282 | 282 | ** --force Ignore edited files in the current checkout |
| 283 | -** --keep Only update the manifest and manifest.uuid files | |
| 283 | +** --keep Only update the manifest file(s) | |
| 284 | 284 | ** --force-missing Force checkout even if content is missing |
| 285 | 285 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 286 | 286 | ** times (the timestamp of the last checkin which modified |
| 287 | 287 | ** them) |
| 288 | 288 | ** |
| 289 | 289 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -278,11 +278,11 @@ | |
| 278 | ** The --latest flag can be used in place of VERSION to checkout the |
| 279 | ** latest version in the repository. |
| 280 | ** |
| 281 | ** Options: |
| 282 | ** --force Ignore edited files in the current checkout |
| 283 | ** --keep Only update the manifest and manifest.uuid files |
| 284 | ** --force-missing Force checkout even if content is missing |
| 285 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 286 | ** times (the timestamp of the last checkin which modified |
| 287 | ** them) |
| 288 | ** |
| 289 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -278,11 +278,11 @@ | |
| 278 | ** The --latest flag can be used in place of VERSION to checkout the |
| 279 | ** latest version in the repository. |
| 280 | ** |
| 281 | ** Options: |
| 282 | ** --force Ignore edited files in the current checkout |
| 283 | ** --keep Only update the manifest file(s) |
| 284 | ** --force-missing Force checkout even if content is missing |
| 285 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 286 | ** times (the timestamp of the last checkin which modified |
| 287 | ** them) |
| 288 | ** |
| 289 |
M
src/db.c
+1
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -3679,11 +3679,11 @@ | ||
| 3679 | 3679 | ** with the local repository. If you commit this checkout, |
| 3680 | 3680 | ** it will become a new "initial" commit in the repository. |
| 3681 | 3681 | ** -f|--force Continue with the open even if the working directory is |
| 3682 | 3682 | ** not empty. |
| 3683 | 3683 | ** --force-missing Force opening a repository with missing content |
| 3684 | -** -k|--keep Only modify the manifest and manifest.uuid files | |
| 3684 | +** -k|--keep Only modify the manifest file(s) | |
| 3685 | 3685 | ** --nested Allow opening a repository inside an opened checkout |
| 3686 | 3686 | ** --nosync Do not auto-sync the repository prior to opening even |
| 3687 | 3687 | ** if the autosync setting is on. |
| 3688 | 3688 | ** --repodir DIR If REPOSITORY is a URI that will be cloned, store |
| 3689 | 3689 | ** the clone in DIR rather than in "." |
| 3690 | 3690 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3679,11 +3679,11 @@ | |
| 3679 | ** with the local repository. If you commit this checkout, |
| 3680 | ** it will become a new "initial" commit in the repository. |
| 3681 | ** -f|--force Continue with the open even if the working directory is |
| 3682 | ** not empty. |
| 3683 | ** --force-missing Force opening a repository with missing content |
| 3684 | ** -k|--keep Only modify the manifest and manifest.uuid files |
| 3685 | ** --nested Allow opening a repository inside an opened checkout |
| 3686 | ** --nosync Do not auto-sync the repository prior to opening even |
| 3687 | ** if the autosync setting is on. |
| 3688 | ** --repodir DIR If REPOSITORY is a URI that will be cloned, store |
| 3689 | ** the clone in DIR rather than in "." |
| 3690 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3679,11 +3679,11 @@ | |
| 3679 | ** with the local repository. If you commit this checkout, |
| 3680 | ** it will become a new "initial" commit in the repository. |
| 3681 | ** -f|--force Continue with the open even if the working directory is |
| 3682 | ** not empty. |
| 3683 | ** --force-missing Force opening a repository with missing content |
| 3684 | ** -k|--keep Only modify the manifest file(s) |
| 3685 | ** --nested Allow opening a repository inside an opened checkout |
| 3686 | ** --nosync Do not auto-sync the repository prior to opening even |
| 3687 | ** if the autosync setting is on. |
| 3688 | ** --repodir DIR If REPOSITORY is a URI that will be cloned, store |
| 3689 | ** the clone in DIR rather than in "." |
| 3690 |