Fossil SCM
Follow-up to [346e45702c]: Remove the (unused) --sync option for the open command, as considering it and overriding local/global/pull-only/push-pull settings gets quite convoluted. Also mention that --force allows to continue if auto-sync fails.
Commit
b3ed9d37d5a5813edbc9e7b674c08eb0ceb572ebe35be603c2af52243419bba8
Parent
287d13f3911a1e8…
1 file changed
+1
-3
M
src/db.c
+1
-3
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -3667,11 +3667,11 @@ | ||
| 3667 | 3667 | ** Options: |
| 3668 | 3668 | ** --empty Initialize checkout as being empty, but still connected |
| 3669 | 3669 | ** with the local repository. If you commit this checkout, |
| 3670 | 3670 | ** it will become a new "initial" commit in the repository. |
| 3671 | 3671 | ** -f|--force Continue with the open even if the working directory is |
| 3672 | -** not empty. | |
| 3672 | +** not empty, or if auto-sync fails. | |
| 3673 | 3673 | ** --force-missing Force opening a repository with missing content |
| 3674 | 3674 | ** -k|--keep Only modify the manifest and manifest.uuid files |
| 3675 | 3675 | ** --nested Allow opening a repository inside an opened checkout |
| 3676 | 3676 | ** --nosync Do not auto-sync the repository prior to opening even |
| 3677 | 3677 | ** if the autosync setting is on. |
| @@ -3678,12 +3678,10 @@ | ||
| 3678 | 3678 | ** --repodir DIR If REPOSITORY is a URI that will be cloned, store |
| 3679 | 3679 | ** the clone in DIR rather than in "." |
| 3680 | 3680 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 3681 | 3681 | ** times (the timestamp of the last checkin which modified |
| 3682 | 3682 | ** them). |
| 3683 | -** --sync Auto-sync prior to opening even if the autosync setting | |
| 3684 | -** is off. | |
| 3685 | 3683 | ** --verbose If passed a URI then this flag is passed on to the clone |
| 3686 | 3684 | ** operation, otherwise it has no effect. |
| 3687 | 3685 | ** --workdir DIR Use DIR as the working directory instead of ".". The DIR |
| 3688 | 3686 | ** directory is created if it does not exist. |
| 3689 | 3687 | ** |
| 3690 | 3688 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3667,11 +3667,11 @@ | |
| 3667 | ** Options: |
| 3668 | ** --empty Initialize checkout as being empty, but still connected |
| 3669 | ** with the local repository. If you commit this checkout, |
| 3670 | ** it will become a new "initial" commit in the repository. |
| 3671 | ** -f|--force Continue with the open even if the working directory is |
| 3672 | ** not empty. |
| 3673 | ** --force-missing Force opening a repository with missing content |
| 3674 | ** -k|--keep Only modify the manifest and manifest.uuid files |
| 3675 | ** --nested Allow opening a repository inside an opened checkout |
| 3676 | ** --nosync Do not auto-sync the repository prior to opening even |
| 3677 | ** if the autosync setting is on. |
| @@ -3678,12 +3678,10 @@ | |
| 3678 | ** --repodir DIR If REPOSITORY is a URI that will be cloned, store |
| 3679 | ** the clone in DIR rather than in "." |
| 3680 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 3681 | ** times (the timestamp of the last checkin which modified |
| 3682 | ** them). |
| 3683 | ** --sync Auto-sync prior to opening even if the autosync setting |
| 3684 | ** is off. |
| 3685 | ** --verbose If passed a URI then this flag is passed on to the clone |
| 3686 | ** operation, otherwise it has no effect. |
| 3687 | ** --workdir DIR Use DIR as the working directory instead of ".". The DIR |
| 3688 | ** directory is created if it does not exist. |
| 3689 | ** |
| 3690 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3667,11 +3667,11 @@ | |
| 3667 | ** Options: |
| 3668 | ** --empty Initialize checkout as being empty, but still connected |
| 3669 | ** with the local repository. If you commit this checkout, |
| 3670 | ** it will become a new "initial" commit in the repository. |
| 3671 | ** -f|--force Continue with the open even if the working directory is |
| 3672 | ** not empty, or if auto-sync fails. |
| 3673 | ** --force-missing Force opening a repository with missing content |
| 3674 | ** -k|--keep Only modify the manifest and manifest.uuid files |
| 3675 | ** --nested Allow opening a repository inside an opened checkout |
| 3676 | ** --nosync Do not auto-sync the repository prior to opening even |
| 3677 | ** if the autosync setting is on. |
| @@ -3678,12 +3678,10 @@ | |
| 3678 | ** --repodir DIR If REPOSITORY is a URI that will be cloned, store |
| 3679 | ** the clone in DIR rather than in "." |
| 3680 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 3681 | ** times (the timestamp of the last checkin which modified |
| 3682 | ** them). |
| 3683 | ** --verbose If passed a URI then this flag is passed on to the clone |
| 3684 | ** operation, otherwise it has no effect. |
| 3685 | ** --workdir DIR Use DIR as the working directory instead of ".". The DIR |
| 3686 | ** directory is created if it does not exist. |
| 3687 | ** |
| 3688 |