2512d2d4728… — Fossil SCM

M src/add.c

-1

		--- src/add.c
		+++ src/add.c
		@@ -362,11 +362,10 @@
362	362	** The --case-sensitive option determines whether or not filenames should
363	363	** be treated case sensitive or not. If the option is not given, the default
364	364	** depends on the global setting, or the operating system default, if not set.
365	365	**
366	366	** Options:
367		-**
368	367	** --case-sensitive BOOL Override the case-sensitive setting
369	368	** --dotfiles Include files beginning with a dot (".")
370	369	** -f\|--force Add files without prompting
371	370	** --ignore CSG Ignore unmanaged files matching patterns from
372	371	** the Comma Separated Glob (CSG) pattern list
373	372

	--- src/add.c
	+++ src/add.c
	@@ -362,11 +362,10 @@
362	** The --case-sensitive option determines whether or not filenames should
363	** be treated case sensitive or not. If the option is not given, the default
364	** depends on the global setting, or the operating system default, if not set.
365	**
366	** Options:
367	**
368	** --case-sensitive BOOL Override the case-sensitive setting
369	** --dotfiles Include files beginning with a dot (".")
370	** -f\|--force Add files without prompting
371	** --ignore CSG Ignore unmanaged files matching patterns from
372	** the Comma Separated Glob (CSG) pattern list
373

	--- src/add.c
	+++ src/add.c
	@@ -362,11 +362,10 @@
362	** The --case-sensitive option determines whether or not filenames should
363	** be treated case sensitive or not. If the option is not given, the default
364	** depends on the global setting, or the operating system default, if not set.
365	**
366	** Options:

367	** --case-sensitive BOOL Override the case-sensitive setting
368	** --dotfiles Include files beginning with a dot (".")
369	** -f\|--force Add files without prompting
370	** --ignore CSG Ignore unmanaged files matching patterns from
371	** the Comma Separated Glob (CSG) pattern list
372

M src/alerts.c

+3 -6

		--- src/alerts.c
		+++ src/alerts.c
		@@ -1127,12 +1127,12 @@
1127	1127	**
1128	1128	** send Compose and send pending email alerts.
1129	1129	** Some installations may want to do this via
1130	1130	** a cron-job to make sure alerts are sent
1131	1131	** in a timely manner.
1132		-** Options:
1133	1132	**
	1133	+** Options:
1134	1134	** --digest Send digests
1135	1135	** --renewal Send subscription renewal
1136	1136	** notices
1137	1137	** --test Write to standard output
1138	1138	**
		@@ -1146,12 +1146,13 @@
1146	1146	** LIKE or GLOB wildcards can be used in PATTERN.
1147	1147	**
1148	1148	** test-message TO [OPTS] Send a single email message using whatever
1149	1149	** email sending mechanism is currently configured.
1150	1150	** Use this for testing the email notification
1151		-** configuration. Options:
	1151	+** configuration.
1152	1152	**
	1153	+** Options:
1153	1154	** --body FILENAME Content from FILENAME
1154	1155	** --smtp-trace Trace SMTP processing
1155	1156	** --stdout Send msg to stdout
1156	1157	** -S\|--subject SUBJECT Message "subject:"
1157	1158	**
		@@ -2708,11 +2709,10 @@
2708	2709	** for check-in, forum, ticket, or wiki. The remaining text is a
2709	2710	** integer that references the EVENT.OBJID value for the event.
2710	2711	** Run /timeline?showid to see these OBJID values.
2711	2712	**
2712	2713	** Options:
2713		-**
2714	2714	** --digest Generate digest alert text
2715	2715	** --needmod Assume all events are pending moderator approval
2716	2716	*/
2717	2717	void test_alert_cmd(void){
2718	2718	Blob out;
		@@ -2769,19 +2769,16 @@
2769	2769	** for check-in, forum, ticket, or wiki. The remaining text is a
2770	2770	** integer that references the EVENT.OBJID value for the event.
2771	2771	** Run /timeline?showid to see these OBJID values.
2772	2772	**
2773	2773	** Options:
2774		-**
2775	2774	** --backoffice Run alert_backoffice() after all alerts have
2776	2775	** been added. This will cause the alerts to be
2777	2776	** sent out with the SENDALERT_TRACE option.
2778		-**
2779	2777	** --debug Like --backoffice, but add the SENDALERT_STDOUT
2780	2778	** so that emails are printed to standard output
2781	2779	** rather than being sent.
2782		-**
2783	2780	** --digest Process emails using SENDALERT_DIGEST
2784	2781	*/
2785	2782	void test_add_alert_cmd(void){
2786	2783	int i;
2787	2784	int doAuto = find_option("backoffice",0,0)!=0;
2788	2785

	--- src/alerts.c
	+++ src/alerts.c
	@@ -1127,12 +1127,12 @@
1127	**
1128	** send Compose and send pending email alerts.
1129	** Some installations may want to do this via
1130	** a cron-job to make sure alerts are sent
1131	** in a timely manner.
1132	** Options:
1133	**

1134	** --digest Send digests
1135	** --renewal Send subscription renewal
1136	** notices
1137	** --test Write to standard output
1138	**
	@@ -1146,12 +1146,13 @@
1146	** LIKE or GLOB wildcards can be used in PATTERN.
1147	**
1148	** test-message TO [OPTS] Send a single email message using whatever
1149	** email sending mechanism is currently configured.
1150	** Use this for testing the email notification
1151	** configuration. Options:
1152	**

1153	** --body FILENAME Content from FILENAME
1154	** --smtp-trace Trace SMTP processing
1155	** --stdout Send msg to stdout
1156	** -S\|--subject SUBJECT Message "subject:"
1157	**
	@@ -2708,11 +2709,10 @@
2708	** for check-in, forum, ticket, or wiki. The remaining text is a
2709	** integer that references the EVENT.OBJID value for the event.
2710	** Run /timeline?showid to see these OBJID values.
2711	**
2712	** Options:
2713	**
2714	** --digest Generate digest alert text
2715	** --needmod Assume all events are pending moderator approval
2716	*/
2717	void test_alert_cmd(void){
2718	Blob out;
	@@ -2769,19 +2769,16 @@
2769	** for check-in, forum, ticket, or wiki. The remaining text is a
2770	** integer that references the EVENT.OBJID value for the event.
2771	** Run /timeline?showid to see these OBJID values.
2772	**
2773	** Options:
2774	**
2775	** --backoffice Run alert_backoffice() after all alerts have
2776	** been added. This will cause the alerts to be
2777	** sent out with the SENDALERT_TRACE option.
2778	**
2779	** --debug Like --backoffice, but add the SENDALERT_STDOUT
2780	** so that emails are printed to standard output
2781	** rather than being sent.
2782	**
2783	** --digest Process emails using SENDALERT_DIGEST
2784	*/
2785	void test_add_alert_cmd(void){
2786	int i;
2787	int doAuto = find_option("backoffice",0,0)!=0;
2788

	--- src/alerts.c
	+++ src/alerts.c
	@@ -1127,12 +1127,12 @@
1127	**
1128	** send Compose and send pending email alerts.
1129	** Some installations may want to do this via
1130	** a cron-job to make sure alerts are sent
1131	** in a timely manner.

1132	**
1133	** Options:
1134	** --digest Send digests
1135	** --renewal Send subscription renewal
1136	** notices
1137	** --test Write to standard output
1138	**
	@@ -1146,12 +1146,13 @@
1146	** LIKE or GLOB wildcards can be used in PATTERN.
1147	**
1148	** test-message TO [OPTS] Send a single email message using whatever
1149	** email sending mechanism is currently configured.
1150	** Use this for testing the email notification
1151	** configuration.
1152	**
1153	** Options:
1154	** --body FILENAME Content from FILENAME
1155	** --smtp-trace Trace SMTP processing
1156	** --stdout Send msg to stdout
1157	** -S\|--subject SUBJECT Message "subject:"
1158	**
	@@ -2708,11 +2709,10 @@
2709	** for check-in, forum, ticket, or wiki. The remaining text is a
2710	** integer that references the EVENT.OBJID value for the event.
2711	** Run /timeline?showid to see these OBJID values.
2712	**
2713	** Options:

2714	** --digest Generate digest alert text
2715	** --needmod Assume all events are pending moderator approval
2716	*/
2717	void test_alert_cmd(void){
2718	Blob out;
	@@ -2769,19 +2769,16 @@
2769	** for check-in, forum, ticket, or wiki. The remaining text is a
2770	** integer that references the EVENT.OBJID value for the event.
2771	** Run /timeline?showid to see these OBJID values.
2772	**
2773	** Options:

2774	** --backoffice Run alert_backoffice() after all alerts have
2775	** been added. This will cause the alerts to be
2776	** sent out with the SENDALERT_TRACE option.

2777	** --debug Like --backoffice, but add the SENDALERT_STDOUT
2778	** so that emails are printed to standard output
2779	** rather than being sent.

2780	** --digest Process emails using SENDALERT_DIGEST
2781	*/
2782	void test_add_alert_cmd(void){
2783	int i;
2784	int doAuto = find_option("backoffice",0,0)!=0;
2785

M src/attach.c

+3 -5

		--- src/attach.c
		+++ src/attach.c
		@@ -678,20 +678,19 @@
678	678	** COMMAND: attachment*
679	679	**
680	680	** Usage: %fossil attachment add ?PAGENAME? FILENAME ?OPTIONS?
681	681	**
682	682	** Add an attachment to an existing wiki page or tech note.
683		-** Options:
684	683	**
	684	+** Options:
685	685	** -t\|--technote DATETIME Specifies the timestamp of
686	686	** the technote to which the attachment
687	687	** is to be made. The attachment will be
688	688	** to the most recently modified tech note
689	689	** with the specified timestamp.
690		-**
691	690	** -t\|--technote TECHNOTE-ID Specifies the technote to be
692		-** updated by its technote id.
	691	+** updated by its technote id
693	692	**
694	693	** One of PAGENAME, DATETIME or TECHNOTE-ID must be specified.
695	694	**
696	695	** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
697	696	** year-month-day form, it may be truncated, the "T" may be replaced by
		@@ -792,12 +791,11 @@
792	791	** name arguments are glob prefixes for the attachment.target
793	792	** field. If no names are provided then a prefix of [a-zA-Z] is used,
794	793	** which will match most wiki page names and some ticket hashes.
795	794	**
796	795	** Options:
797		-**
798		-** -latest List only the latest version of a given attachment.
	796	+** -latest List only the latest version of a given attachment
799	797	**
800	798	*/
801	799	void test_list_attachments(void){
802	800	Stmt q;
803	801	int i;
804	802

	--- src/attach.c
	+++ src/attach.c
	@@ -678,20 +678,19 @@
678	** COMMAND: attachment*
679	**
680	** Usage: %fossil attachment add ?PAGENAME? FILENAME ?OPTIONS?
681	**
682	** Add an attachment to an existing wiki page or tech note.
683	** Options:
684	**

685	** -t\|--technote DATETIME Specifies the timestamp of
686	** the technote to which the attachment
687	** is to be made. The attachment will be
688	** to the most recently modified tech note
689	** with the specified timestamp.
690	**
691	** -t\|--technote TECHNOTE-ID Specifies the technote to be
692	** updated by its technote id.
693	**
694	** One of PAGENAME, DATETIME or TECHNOTE-ID must be specified.
695	**
696	** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
697	** year-month-day form, it may be truncated, the "T" may be replaced by
	@@ -792,12 +791,11 @@
792	** name arguments are glob prefixes for the attachment.target
793	** field. If no names are provided then a prefix of [a-zA-Z] is used,
794	** which will match most wiki page names and some ticket hashes.
795	**
796	** Options:
797	**
798	** -latest List only the latest version of a given attachment.
799	**
800	*/
801	void test_list_attachments(void){
802	Stmt q;
803	int i;
804

	--- src/attach.c
	+++ src/attach.c
	@@ -678,20 +678,19 @@
678	** COMMAND: attachment*
679	**
680	** Usage: %fossil attachment add ?PAGENAME? FILENAME ?OPTIONS?
681	**
682	** Add an attachment to an existing wiki page or tech note.

683	**
684	** Options:
685	** -t\|--technote DATETIME Specifies the timestamp of
686	** the technote to which the attachment
687	** is to be made. The attachment will be
688	** to the most recently modified tech note
689	** with the specified timestamp.

690	** -t\|--technote TECHNOTE-ID Specifies the technote to be
691	** updated by its technote id
692	**
693	** One of PAGENAME, DATETIME or TECHNOTE-ID must be specified.
694	**
695	** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
696	** year-month-day form, it may be truncated, the "T" may be replaced by
	@@ -792,12 +791,11 @@
791	** name arguments are glob prefixes for the attachment.target
792	** field. If no names are provided then a prefix of [a-zA-Z] is used,
793	** which will match most wiki page names and some ticket hashes.
794	**
795	** Options:
796	** -latest List only the latest version of a given attachment

797	**
798	*/
799	void test_list_attachments(void){
800	Stmt q;
801	int i;
802

M src/backlink.c

+1 -1

		--- src/backlink.c
		+++ src/backlink.c
		@@ -358,11 +358,11 @@
358	358	** just print them on stdout. SRCID and SRCTYPE are integers.
359	359	**
360	360	** Options:
361	361	** --mtime DATETIME Use an alternative date/time. Defaults to the
362	362	** current date/time.
363		-** --mimetype TYPE Use an alternative mimetype.
	363	+** --mimetype TYPE Use an alternative mimetype
364	364	*/
365	365	void test_backlinks_cmd(void){
366	366	const char *zMTime = find_option("mtime",0,1);
367	367	const char *zMimetype = find_option("mimetype",0,1);
368	368	const int mimetype = parse_mimetype(zMimetype);
369	369

	--- src/backlink.c
	+++ src/backlink.c
	@@ -358,11 +358,11 @@
358	** just print them on stdout. SRCID and SRCTYPE are integers.
359	**
360	** Options:
361	** --mtime DATETIME Use an alternative date/time. Defaults to the
362	** current date/time.
363	** --mimetype TYPE Use an alternative mimetype.
364	*/
365	void test_backlinks_cmd(void){
366	const char *zMTime = find_option("mtime",0,1);
367	const char *zMimetype = find_option("mimetype",0,1);
368	const int mimetype = parse_mimetype(zMimetype);
369

	--- src/backlink.c
	+++ src/backlink.c
	@@ -358,11 +358,11 @@
358	** just print them on stdout. SRCID and SRCTYPE are integers.
359	**
360	** Options:
361	** --mtime DATETIME Use an alternative date/time. Defaults to the
362	** current date/time.
363	** --mimetype TYPE Use an alternative mimetype
364	*/
365	void test_backlinks_cmd(void){
366	const char *zMTime = find_option("mtime",0,1);
367	const char *zMimetype = find_option("mimetype",0,1);
368	const int mimetype = parse_mimetype(zMimetype);
369

M src/bisect.c

+3 -2

		--- src/bisect.c
		+++ src/bisect.c
		@@ -386,12 +386,12 @@
386	386
387	387	/*
388	388	** fossil bisect run [OPTIONS] COMMAND
389	389	**
390	390	** Invoke COMMAND (with arguments) repeatedly to perform the bisect.
391		-** Options:
392	391	**
	392	+** Options:
393	393	** -i\|--interactive Prompt user for decisions rather than
394	394	** using the return code from COMMAND
395	395	*/
396	396	static void bisect_run(void){
397	397	const char *zCmd;
		@@ -507,12 +507,13 @@
507	507	**
508	508	** > fossil bisect run [OPTIONS] COMMAND
509	509	**
510	510	** Invoke COMMAND repeatedly to run the bisect. The exit code for
511	511	** COMMAND should be 0 for "good", 125 for "skip", and any other value
512		-** for "bad". Options:
	512	+** for "bad".
513	513	**
	514	+** Options:
514	515	** -i\|--interactive Prompt the user for the good/bad/skip decision
515	516	** after each step, rather than using the exit
516	517	** code from COMMAND
517	518	**
518	519	** > fossil bisect skip ?VERSION?
519	520

	--- src/bisect.c
	+++ src/bisect.c
	@@ -386,12 +386,12 @@
386
387	/*
388	** fossil bisect run [OPTIONS] COMMAND
389	**
390	** Invoke COMMAND (with arguments) repeatedly to perform the bisect.
391	** Options:
392	**

393	** -i\|--interactive Prompt user for decisions rather than
394	** using the return code from COMMAND
395	*/
396	static void bisect_run(void){
397	const char *zCmd;
	@@ -507,12 +507,13 @@
507	**
508	** > fossil bisect run [OPTIONS] COMMAND
509	**
510	** Invoke COMMAND repeatedly to run the bisect. The exit code for
511	** COMMAND should be 0 for "good", 125 for "skip", and any other value
512	** for "bad". Options:
513	**

514	** -i\|--interactive Prompt the user for the good/bad/skip decision
515	** after each step, rather than using the exit
516	** code from COMMAND
517	**
518	** > fossil bisect skip ?VERSION?
519

	--- src/bisect.c
	+++ src/bisect.c
	@@ -386,12 +386,12 @@
386
387	/*
388	** fossil bisect run [OPTIONS] COMMAND
389	**
390	** Invoke COMMAND (with arguments) repeatedly to perform the bisect.

391	**
392	** Options:
393	** -i\|--interactive Prompt user for decisions rather than
394	** using the return code from COMMAND
395	*/
396	static void bisect_run(void){
397	const char *zCmd;
	@@ -507,12 +507,13 @@
507	**
508	** > fossil bisect run [OPTIONS] COMMAND
509	**
510	** Invoke COMMAND repeatedly to run the bisect. The exit code for
511	** COMMAND should be 0 for "good", 125 for "skip", and any other value
512	** for "bad".
513	**
514	** Options:
515	** -i\|--interactive Prompt the user for the good/bad/skip decision
516	** after each step, rather than using the exit
517	** code from COMMAND
518	**
519	** > fossil bisect skip ?VERSION?
520

M src/branch.c

+16 -12

		--- src/branch.c
		+++ src/branch.c
		@@ -586,14 +586,16 @@
586	586	** > fossil branch close\|reopen ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES?
587	587	**
588	588	** Adds or cancels the "closed" tag to one or more branches.
589	589	** It accepts arbitrary unambiguous symbolic names but
590	590	** will only resolve check-in names and skips any which resolve
591		-** to non-leaf check-ins. Options:
592		-** -n\|--dry-run do not commit changes and dump artifact
	591	+** to non-leaf check-ins.
	592	+**
	593	+** Options:
	594	+** -n\|--dry-run Do not commit changes, but dump artifact
593	595	** to stdout
594		-** -v\|--verbose output more information
	596	+** -v\|--verbose Output more information
595	597	** --date-override DATE DATE to use instead of 'now'
596	598	** --user-override USER USER to use instead of the current default
597	599	**
598	600	** > fossil branch current
599	601	**
		@@ -610,14 +612,16 @@
610	612	** Print information about a branch
611	613	**
612	614	** > fossil branch list\|ls ?OPTIONS? ?GLOB?
613	615	** > fossil branch lsh ?OPTIONS? ?LIMIT?
614	616	**
615		-** List all branches. Options:
	617	+** List all branches.
	618	+**
	619	+** Options:
616	620	** -a\|--all List all branches. Default show only open branches
617		-** -c\|--closed List closed branches.
618		-** -p List only private branches.
	621	+** -c\|--closed List closed branches
	622	+** -p List only private branches
619	623	** -r Reverse the sort order
620	624	** -t Show recently changed branches first
621	625	**
622	626	** The current branch is marked with an asterisk. Private branches are
623	627	** marked with a hash sign.
		@@ -630,27 +634,27 @@
630	634	** an implied no-op.
631	635	**
632	636	** > fossil branch new BRANCH-NAME BASIS ?OPTIONS?
633	637	**
634	638	** Create a new branch BRANCH-NAME off of check-in BASIS.
635		-** Supported options for this subcommand include:
636		-** --private branch is private (i.e., remains local)
637		-** --bgcolor COLOR use COLOR instead of automatic background
	639	+**
	640	+** Options:
	641	+** --private Branch is private (i.e., remains local)
	642	+** --bgcolor COLOR Use COLOR instead of automatic background
638	643	** ("auto" lets Fossil choose it automatically,
639	644	** even for private branches)
640		-** --nosign do not sign contents on this branch
	645	+** --nosign Do not sign contents on this branch
641	646	** --date-override DATE DATE to use instead of 'now'
642	647	** --user-override USER USER to use instead of the current default
643	648	**
644	649	** DATE may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
645	650	** year-month-day form, it may be truncated, the "T" may be
646	651	** replaced by a space, and it may also name a timezone offset
647	652	** from UTC as "-HH:MM" (westward) or "+HH:MM" (eastward).
648	653	** Either no timezone suffix or "Z" means UTC.
649	654	**
650		-** Options valid for all subcommands:
651		-**
	655	+** Options:
652	656	** -R\|--repository REPO Run commands on repository REPO
653	657	*/
654	658	void branch_cmd(void){
655	659	int n;
656	660	const char *zCmd = "list";
657	661

	--- src/branch.c
	+++ src/branch.c
	@@ -586,14 +586,16 @@
586	** > fossil branch close\|reopen ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES?
587	**
588	** Adds or cancels the "closed" tag to one or more branches.
589	** It accepts arbitrary unambiguous symbolic names but
590	** will only resolve check-in names and skips any which resolve
591	** to non-leaf check-ins. Options:
592	** -n\|--dry-run do not commit changes and dump artifact


593	** to stdout
594	** -v\|--verbose output more information
595	** --date-override DATE DATE to use instead of 'now'
596	** --user-override USER USER to use instead of the current default
597	**
598	** > fossil branch current
599	**
	@@ -610,14 +612,16 @@
610	** Print information about a branch
611	**
612	** > fossil branch list\|ls ?OPTIONS? ?GLOB?
613	** > fossil branch lsh ?OPTIONS? ?LIMIT?
614	**
615	** List all branches. Options:


616	** -a\|--all List all branches. Default show only open branches
617	** -c\|--closed List closed branches.
618	** -p List only private branches.
619	** -r Reverse the sort order
620	** -t Show recently changed branches first
621	**
622	** The current branch is marked with an asterisk. Private branches are
623	** marked with a hash sign.
	@@ -630,27 +634,27 @@
630	** an implied no-op.
631	**
632	** > fossil branch new BRANCH-NAME BASIS ?OPTIONS?
633	**
634	** Create a new branch BRANCH-NAME off of check-in BASIS.
635	** Supported options for this subcommand include:
636	** --private branch is private (i.e., remains local)
637	** --bgcolor COLOR use COLOR instead of automatic background

638	** ("auto" lets Fossil choose it automatically,
639	** even for private branches)
640	** --nosign do not sign contents on this branch
641	** --date-override DATE DATE to use instead of 'now'
642	** --user-override USER USER to use instead of the current default
643	**
644	** DATE may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
645	** year-month-day form, it may be truncated, the "T" may be
646	** replaced by a space, and it may also name a timezone offset
647	** from UTC as "-HH:MM" (westward) or "+HH:MM" (eastward).
648	** Either no timezone suffix or "Z" means UTC.
649	**
650	** Options valid for all subcommands:
651	**
652	** -R\|--repository REPO Run commands on repository REPO
653	*/
654	void branch_cmd(void){
655	int n;
656	const char *zCmd = "list";
657

	--- src/branch.c
	+++ src/branch.c
	@@ -586,14 +586,16 @@
586	** > fossil branch close\|reopen ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES?
587	**
588	** Adds or cancels the "closed" tag to one or more branches.
589	** It accepts arbitrary unambiguous symbolic names but
590	** will only resolve check-in names and skips any which resolve
591	** to non-leaf check-ins.
592	**
593	** Options:
594	** -n\|--dry-run Do not commit changes, but dump artifact
595	** to stdout
596	** -v\|--verbose Output more information
597	** --date-override DATE DATE to use instead of 'now'
598	** --user-override USER USER to use instead of the current default
599	**
600	** > fossil branch current
601	**
	@@ -610,14 +612,16 @@
612	** Print information about a branch
613	**
614	** > fossil branch list\|ls ?OPTIONS? ?GLOB?
615	** > fossil branch lsh ?OPTIONS? ?LIMIT?
616	**
617	** List all branches.
618	**
619	** Options:
620	** -a\|--all List all branches. Default show only open branches
621	** -c\|--closed List closed branches
622	** -p List only private branches
623	** -r Reverse the sort order
624	** -t Show recently changed branches first
625	**
626	** The current branch is marked with an asterisk. Private branches are
627	** marked with a hash sign.
	@@ -630,27 +634,27 @@
634	** an implied no-op.
635	**
636	** > fossil branch new BRANCH-NAME BASIS ?OPTIONS?
637	**
638	** Create a new branch BRANCH-NAME off of check-in BASIS.
639	**
640	** Options:
641	** --private Branch is private (i.e., remains local)
642	** --bgcolor COLOR Use COLOR instead of automatic background
643	** ("auto" lets Fossil choose it automatically,
644	** even for private branches)
645	** --nosign Do not sign contents on this branch
646	** --date-override DATE DATE to use instead of 'now'
647	** --user-override USER USER to use instead of the current default
648	**
649	** DATE may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
650	** year-month-day form, it may be truncated, the "T" may be
651	** replaced by a space, and it may also name a timezone offset
652	** from UTC as "-HH:MM" (westward) or "+HH:MM" (eastward).
653	** Either no timezone suffix or "Z" means UTC.
654	**
655	** Options:

656	** -R\|--repository REPO Run commands on repository REPO
657	*/
658	void branch_cmd(void){
659	int n;
660	const char *zCmd = "list";
661

M src/checkout.c

+1 -1

		--- src/checkout.c
		+++ src/checkout.c
		@@ -397,11 +397,11 @@
397	397	** The opposite of "[[open]]". Close the current database connection.
398	398	** Require a -f or --force flag if there are unsaved changes in the
399	399	** current check-out or if there is non-empty stash.
400	400	**
401	401	** Options:
402		-** -f\|--force necessary to close a check-out with uncommitted changes
	402	+** -f\|--force Necessary to close a check-out with uncommitted changes
403	403	**
404	404	** See also: [[open]]
405	405	*/
406	406	void close_cmd(void){
407	407	int forceFlag = find_option("force","f",0)!=0;
408	408

	--- src/checkout.c
	+++ src/checkout.c
	@@ -397,11 +397,11 @@
397	** The opposite of "[[open]]". Close the current database connection.
398	** Require a -f or --force flag if there are unsaved changes in the
399	** current check-out or if there is non-empty stash.
400	**
401	** Options:
402	** -f\|--force necessary to close a check-out with uncommitted changes
403	**
404	** See also: [[open]]
405	*/
406	void close_cmd(void){
407	int forceFlag = find_option("force","f",0)!=0;
408

	--- src/checkout.c
	+++ src/checkout.c
	@@ -397,11 +397,11 @@
397	** The opposite of "[[open]]". Close the current database connection.
398	** Require a -f or --force flag if there are unsaved changes in the
399	** current check-out or if there is non-empty stash.
400	**
401	** Options:
402	** -f\|--force Necessary to close a check-out with uncommitted changes
403	**
404	** See also: [[open]]
405	*/
406	void close_cmd(void){
407	int forceFlag = find_option("force","f",0)!=0;
408

M src/clone.c

+1 -1

		--- src/clone.c
		+++ src/clone.c
		@@ -130,11 +130,11 @@
130	130	** --nocompress Omit extra delta compression
131	131	** --no-open Clone only. Do not open a check-out.
132	132	** --once Don't remember the URI.
133	133	** --private Also clone private branches
134	134	** --save-http-password Remember the HTTP password without asking
135		-** --ssh-command\|-c SSH Use SSH as the "ssh" command
	135	+** -c\|--ssh-command SSH Use SSH as the "ssh" command
136	136	** --ssl-identity FILENAME Use the SSL identity if requested by the server
137	137	** --transport-command CMD Use CMD to move messages to the server and back
138	138	** -u\|--unversioned Also sync unversioned content
139	139	** -v\|--verbose Show more statistics in output
140	140	** --workdir DIR Also open a check-out in DIR
141	141

	--- src/clone.c
	+++ src/clone.c
	@@ -130,11 +130,11 @@
130	** --nocompress Omit extra delta compression
131	** --no-open Clone only. Do not open a check-out.
132	** --once Don't remember the URI.
133	** --private Also clone private branches
134	** --save-http-password Remember the HTTP password without asking
135	** --ssh-command\|-c SSH Use SSH as the "ssh" command
136	** --ssl-identity FILENAME Use the SSL identity if requested by the server
137	** --transport-command CMD Use CMD to move messages to the server and back
138	** -u\|--unversioned Also sync unversioned content
139	** -v\|--verbose Show more statistics in output
140	** --workdir DIR Also open a check-out in DIR
141

	--- src/clone.c
	+++ src/clone.c
	@@ -130,11 +130,11 @@
130	** --nocompress Omit extra delta compression
131	** --no-open Clone only. Do not open a check-out.
132	** --once Don't remember the URI.
133	** --private Also clone private branches
134	** --save-http-password Remember the HTTP password without asking
135	** -c\|--ssh-command SSH Use SSH as the "ssh" command
136	** --ssl-identity FILENAME Use the SSL identity if requested by the server
137	** --transport-command CMD Use CMD to move messages to the server and back
138	** -u\|--unversioned Also sync unversioned content
139	** -v\|--verbose Show more statistics in output
140	** --workdir DIR Also open a check-out in DIR
141

M src/comformat.c

+6 -6

		--- src/comformat.c
		+++ src/comformat.c
		@@ -546,19 +546,19 @@
546	546	**
547	547	** Test comment formatting and printing. Use for testing only.
548	548	**
549	549	** Options:
550	550	** --file The comment text is really just a file name to
551		-** read it from.
	551	+** read it from
552	552	** --decode Decode the text using the same method used when
553	553	** handling the value of a C-card from a manifest.
554		-** --legacy Use the legacy comment printing algorithm.
555		-** --trimcrlf Enable trimming of leading/trailing CR/LF.
556		-** --trimspace Enable trimming of leading/trailing spaces.
557		-** --wordbreak Attempt to break lines on word boundaries.
	554	+** --legacy Use the legacy comment printing algorithm
	555	+** --trimcrlf Enable trimming of leading/trailing CR/LF
	556	+** --trimspace Enable trimming of leading/trailing spaces
	557	+** --wordbreak Attempt to break lines on word boundaries
558	558	** --origbreak Attempt to break when the original comment text
559		-** is detected.
	559	+** is detected
560	560	** --indent Number of spaces to indent (default (-1) is to
561	561	** auto-detect). Zero means no indent.
562	562	** -W\|--width NUM Width of lines (default (-1) is to auto-detect).
563	563	** Zero means no limit.
564	564	*/
565	565

	--- src/comformat.c
	+++ src/comformat.c
	@@ -546,19 +546,19 @@
546	**
547	** Test comment formatting and printing. Use for testing only.
548	**
549	** Options:
550	** --file The comment text is really just a file name to
551	** read it from.
552	** --decode Decode the text using the same method used when
553	** handling the value of a C-card from a manifest.
554	** --legacy Use the legacy comment printing algorithm.
555	** --trimcrlf Enable trimming of leading/trailing CR/LF.
556	** --trimspace Enable trimming of leading/trailing spaces.
557	** --wordbreak Attempt to break lines on word boundaries.
558	** --origbreak Attempt to break when the original comment text
559	** is detected.
560	** --indent Number of spaces to indent (default (-1) is to
561	** auto-detect). Zero means no indent.
562	** -W\|--width NUM Width of lines (default (-1) is to auto-detect).
563	** Zero means no limit.
564	*/
565

	--- src/comformat.c
	+++ src/comformat.c
	@@ -546,19 +546,19 @@
546	**
547	** Test comment formatting and printing. Use for testing only.
548	**
549	** Options:
550	** --file The comment text is really just a file name to
551	** read it from
552	** --decode Decode the text using the same method used when
553	** handling the value of a C-card from a manifest.
554	** --legacy Use the legacy comment printing algorithm
555	** --trimcrlf Enable trimming of leading/trailing CR/LF
556	** --trimspace Enable trimming of leading/trailing spaces
557	** --wordbreak Attempt to break lines on word boundaries
558	** --origbreak Attempt to break when the original comment text
559	** is detected
560	** --indent Number of spaces to indent (default (-1) is to
561	** auto-detect). Zero means no indent.
562	** -W\|--width NUM Width of lines (default (-1) is to auto-detect).
563	** Zero means no limit.
564	*/
565

M src/content.c

-4

		--- src/content.c
		+++ src/content.c
		@@ -957,17 +957,14 @@
957	957	** Verify that all content can be extracted from the BLOB table correctly.
958	958	** If the BLOB table is correct, then the repository can always be
959	959	** successfully reconstructed using "fossil rebuild".
960	960	**
961	961	** Options:
962		-**
963	962	** -d\|--db-only Run "PRAGMA integrity_check" on the database only.
964	963	** No other validation is performed.
965		-**
966	964	** --parse Parse all manifests, wikis, tickets, events, and
967	965	** so forth, reporting any errors found.
968		-**
969	966	** -q\|--quick Run "PRAGMA quick_check" on the database only.
970	967	** No other validation is performed.
971	968	*/
972	969	void test_integrity(void){
973	970	Stmt q;
		@@ -1197,11 +1194,10 @@
1197	1194	** Look at every artifact in the repository and verify that
1198	1195	** all references are satisfied. Report any referenced artifacts
1199	1196	** that are missing or shunned.
1200	1197	**
1201	1198	** Options:
1202		-**
1203	1199	** --notshunned Do not report shunned artifacts
1204	1200	** --quiet Only show output if there are errors
1205	1201	*/
1206	1202	void test_missing(void){
1207	1203	Stmt q;
1208	1204

	--- src/content.c
	+++ src/content.c
	@@ -957,17 +957,14 @@
957	** Verify that all content can be extracted from the BLOB table correctly.
958	** If the BLOB table is correct, then the repository can always be
959	** successfully reconstructed using "fossil rebuild".
960	**
961	** Options:
962	**
963	** -d\|--db-only Run "PRAGMA integrity_check" on the database only.
964	** No other validation is performed.
965	**
966	** --parse Parse all manifests, wikis, tickets, events, and
967	** so forth, reporting any errors found.
968	**
969	** -q\|--quick Run "PRAGMA quick_check" on the database only.
970	** No other validation is performed.
971	*/
972	void test_integrity(void){
973	Stmt q;
	@@ -1197,11 +1194,10 @@
1197	** Look at every artifact in the repository and verify that
1198	** all references are satisfied. Report any referenced artifacts
1199	** that are missing or shunned.
1200	**
1201	** Options:
1202	**
1203	** --notshunned Do not report shunned artifacts
1204	** --quiet Only show output if there are errors
1205	*/
1206	void test_missing(void){
1207	Stmt q;
1208

	--- src/content.c
	+++ src/content.c
	@@ -957,17 +957,14 @@
957	** Verify that all content can be extracted from the BLOB table correctly.
958	** If the BLOB table is correct, then the repository can always be
959	** successfully reconstructed using "fossil rebuild".
960	**
961	** Options:

962	** -d\|--db-only Run "PRAGMA integrity_check" on the database only.
963	** No other validation is performed.

964	** --parse Parse all manifests, wikis, tickets, events, and
965	** so forth, reporting any errors found.

966	** -q\|--quick Run "PRAGMA quick_check" on the database only.
967	** No other validation is performed.
968	*/
969	void test_integrity(void){
970	Stmt q;
	@@ -1197,11 +1194,10 @@
1194	** Look at every artifact in the repository and verify that
1195	** all references are satisfied. Report any referenced artifacts
1196	** that are missing or shunned.
1197	**
1198	** Options:

1199	** --notshunned Do not report shunned artifacts
1200	** --quiet Only show output if there are errors
1201	*/
1202	void test_missing(void){
1203	Stmt q;
1204

M src/db.c

+3 -5

		--- src/db.c
		+++ src/db.c
		@@ -917,13 +917,12 @@
917	917	/*
918	918	** COMMAND: test-db-prepare
919	919	** Usage: %fossil test-db-prepare ?OPTIONS? SQL-STATEMENT
920	920	**
921	921	** Options:
922		-**
923		-** --auth-report Enable the ticket report query authorizer.
924		-** --auth-ticket Enable the ticket schema query authorizer.
	922	+** --auth-report Enable the ticket report query authorizer
	923	+** --auth-ticket Enable the ticket schema query authorizer
925	924	**
926	925	** Invoke db_prepare() on the SQL input. Report any errors encountered.
927	926	** This command is used to verify error detection logic in the db_prepare()
928	927	** utility routine.
929	928	*/
		@@ -4701,11 +4700,10 @@
4701	4700	** on the local settings. Use the --global option to change global settings.
4702	4701	**
4703	4702	** Options:
4704	4703	** --global Set or unset the given property globally instead of
4705	4704	** setting or unsetting it for the open repository only
4706		-**
4707	4705	** --exact Only consider exact name matches
4708	4706	**
4709	4707	** See also: [[configuration]]
4710	4708	*/
4711	4709	void setting_cmd(void){
		@@ -4855,11 +4853,11 @@
4855	4853	**
4856	4854	** The purpose of this command is for testing the WITHOUT ROWID capabilities
4857	4855	** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
4858	4856	**
4859	4857	** Options:
4860		-** --dry-run \| -n No changes. Just print what would happen.
	4858	+** -n\|--dry-run No changes. Just print what would happen.
4861	4859	*/
4862	4860	void test_without_rowid(void){
4863	4861	int i, j;
4864	4862	Stmt q;
4865	4863	Blob allSql;
4866	4864

	--- src/db.c
	+++ src/db.c
	@@ -917,13 +917,12 @@
917	/*
918	** COMMAND: test-db-prepare
919	** Usage: %fossil test-db-prepare ?OPTIONS? SQL-STATEMENT
920	**
921	** Options:
922	**
923	** --auth-report Enable the ticket report query authorizer.
924	** --auth-ticket Enable the ticket schema query authorizer.
925	**
926	** Invoke db_prepare() on the SQL input. Report any errors encountered.
927	** This command is used to verify error detection logic in the db_prepare()
928	** utility routine.
929	*/
	@@ -4701,11 +4700,10 @@
4701	** on the local settings. Use the --global option to change global settings.
4702	**
4703	** Options:
4704	** --global Set or unset the given property globally instead of
4705	** setting or unsetting it for the open repository only
4706	**
4707	** --exact Only consider exact name matches
4708	**
4709	** See also: [[configuration]]
4710	*/
4711	void setting_cmd(void){
	@@ -4855,11 +4853,11 @@
4855	**
4856	** The purpose of this command is for testing the WITHOUT ROWID capabilities
4857	** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
4858	**
4859	** Options:
4860	** --dry-run \| -n No changes. Just print what would happen.
4861	*/
4862	void test_without_rowid(void){
4863	int i, j;
4864	Stmt q;
4865	Blob allSql;
4866

	--- src/db.c
	+++ src/db.c
	@@ -917,13 +917,12 @@
917	/*
918	** COMMAND: test-db-prepare
919	** Usage: %fossil test-db-prepare ?OPTIONS? SQL-STATEMENT
920	**
921	** Options:
922	** --auth-report Enable the ticket report query authorizer
923	** --auth-ticket Enable the ticket schema query authorizer

924	**
925	** Invoke db_prepare() on the SQL input. Report any errors encountered.
926	** This command is used to verify error detection logic in the db_prepare()
927	** utility routine.
928	*/
	@@ -4701,11 +4700,10 @@
4700	** on the local settings. Use the --global option to change global settings.
4701	**
4702	** Options:
4703	** --global Set or unset the given property globally instead of
4704	** setting or unsetting it for the open repository only

4705	** --exact Only consider exact name matches
4706	**
4707	** See also: [[configuration]]
4708	*/
4709	void setting_cmd(void){
	@@ -4855,11 +4853,11 @@
4853	**
4854	** The purpose of this command is for testing the WITHOUT ROWID capabilities
4855	** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
4856	**
4857	** Options:
4858	** -n\|--dry-run No changes. Just print what would happen.
4859	*/
4860	void test_without_rowid(void){
4861	int i, j;
4862	Stmt q;
4863	Blob allSql;
4864

M src/dispatch.c

+7 -7

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -624,19 +624,19 @@
624	624	** Show help text for commands and pages. Useful for proof-reading.
625	625	** Defaults to just the CLI commands. Specify --www to see only the
626	626	** web pages, or --everything to see both commands and pages.
627	627	**
628	628	** Options:
629		-** -a\|--aliases Show aliases.
	629	+** -a\|--aliases Show aliases
630	630	** -e\|--everything Show all commands and pages. Omit aliases to
631	631	** avoid duplicates.
632		-** -h\|--html Transform output to HTML.
633		-** -o\|--options Show global options.
634		-** -r\|--raw No output formatting.
635		-** -s\|--settings Show settings.
636		-** -t\|--test Include test- commands.
637		-** -w\|--www Show WWW pages.
	632	+** -h\|--html Transform output to HTML
	633	+** -o\|--options Show global options
	634	+** -r\|--raw No output formatting
	635	+** -s\|--settings Show settings
	636	+** -t\|--test Include test- commands
	637	+** -w\|--www Show WWW pages
638	638	*/
639	639	void test_all_help_cmd(void){
640	640	int mask = CMDFLAG_1ST_TIER \| CMDFLAG_2ND_TIER;
641	641	int useHtml = find_option("html","h",0)!=0;
642	642	int rawOut = find_option("raw","r",0)!=0;
643	643

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -624,19 +624,19 @@
624	** Show help text for commands and pages. Useful for proof-reading.
625	** Defaults to just the CLI commands. Specify --www to see only the
626	** web pages, or --everything to see both commands and pages.
627	**
628	** Options:
629	** -a\|--aliases Show aliases.
630	** -e\|--everything Show all commands and pages. Omit aliases to
631	** avoid duplicates.
632	** -h\|--html Transform output to HTML.
633	** -o\|--options Show global options.
634	** -r\|--raw No output formatting.
635	** -s\|--settings Show settings.
636	** -t\|--test Include test- commands.
637	** -w\|--www Show WWW pages.
638	*/
639	void test_all_help_cmd(void){
640	int mask = CMDFLAG_1ST_TIER \| CMDFLAG_2ND_TIER;
641	int useHtml = find_option("html","h",0)!=0;
642	int rawOut = find_option("raw","r",0)!=0;
643

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -624,19 +624,19 @@
624	** Show help text for commands and pages. Useful for proof-reading.
625	** Defaults to just the CLI commands. Specify --www to see only the
626	** web pages, or --everything to see both commands and pages.
627	**
628	** Options:
629	** -a\|--aliases Show aliases
630	** -e\|--everything Show all commands and pages. Omit aliases to
631	** avoid duplicates.
632	** -h\|--html Transform output to HTML
633	** -o\|--options Show global options
634	** -r\|--raw No output formatting
635	** -s\|--settings Show settings
636	** -t\|--test Include test- commands
637	** -w\|--www Show WWW pages
638	*/
639	void test_all_help_cmd(void){
640	int mask = CMDFLAG_1ST_TIER \| CMDFLAG_2ND_TIER;
641	int useHtml = find_option("html","h",0)!=0;
642	int rawOut = find_option("raw","r",0)!=0;
643

M src/file.c

+4 -5

		--- src/file.c
		+++ src/file.c
		@@ -1475,16 +1475,15 @@
1475	1475	**
1476	1476	** Display the effective file handling subsystem "settings" and then
1477	1477	** display file system information about the files specified, if any.
1478	1478	**
1479	1479	** Options:
1480		-**
1481	1480	** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off
1482		-** --open-config Open the configuration database first.
1483		-** --reset Reset cached stat() info for each file.
	1481	+** --open-config Open the configuration database first
	1482	+** --reset Reset cached stat() info for each file
1484	1483	** --root ROOT Use ROOT as the root of the check-out
1485		-** --slash Trailing slashes, if any, are retained.
	1484	+** --slash Trailing slashes, if any, are retained
1486	1485	*/
1487	1486	void cmd_test_file_environment(void){
1488	1487	int i;
1489	1488	int slashFlag = find_option("slash",0,0)!=0;
1490	1489	int resetFlag = find_option("reset",0,0)!=0;
		@@ -1774,11 +1773,11 @@
1774	1773	** COMMAND: test-tree-name
1775	1774	**
1776	1775	** Test the operation of the tree name generator.
1777	1776	**
1778	1777	** Options:
1779		-** --absolute Return an absolute path instead of a relative one.
	1778	+** --absolute Return an absolute path instead of a relative one
1780	1779	** --case-sensitive B Enable or disable case-sensitive filenames. B is
1781	1780	** a boolean: "yes", "no", "true", "false", etc.
1782	1781	*/
1783	1782	void cmd_test_tree_name(void){
1784	1783	int i;
1785	1784

	--- src/file.c
	+++ src/file.c
	@@ -1475,16 +1475,15 @@
1475	**
1476	** Display the effective file handling subsystem "settings" and then
1477	** display file system information about the files specified, if any.
1478	**
1479	** Options:
1480	**
1481	** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off
1482	** --open-config Open the configuration database first.
1483	** --reset Reset cached stat() info for each file.
1484	** --root ROOT Use ROOT as the root of the check-out
1485	** --slash Trailing slashes, if any, are retained.
1486	*/
1487	void cmd_test_file_environment(void){
1488	int i;
1489	int slashFlag = find_option("slash",0,0)!=0;
1490	int resetFlag = find_option("reset",0,0)!=0;
	@@ -1774,11 +1773,11 @@
1774	** COMMAND: test-tree-name
1775	**
1776	** Test the operation of the tree name generator.
1777	**
1778	** Options:
1779	** --absolute Return an absolute path instead of a relative one.
1780	** --case-sensitive B Enable or disable case-sensitive filenames. B is
1781	** a boolean: "yes", "no", "true", "false", etc.
1782	*/
1783	void cmd_test_tree_name(void){
1784	int i;
1785

	--- src/file.c
	+++ src/file.c
	@@ -1475,16 +1475,15 @@
1475	**
1476	** Display the effective file handling subsystem "settings" and then
1477	** display file system information about the files specified, if any.
1478	**
1479	** Options:

1480	** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off
1481	** --open-config Open the configuration database first
1482	** --reset Reset cached stat() info for each file
1483	** --root ROOT Use ROOT as the root of the check-out
1484	** --slash Trailing slashes, if any, are retained
1485	*/
1486	void cmd_test_file_environment(void){
1487	int i;
1488	int slashFlag = find_option("slash",0,0)!=0;
1489	int resetFlag = find_option("reset",0,0)!=0;
	@@ -1774,11 +1773,11 @@
1773	** COMMAND: test-tree-name
1774	**
1775	** Test the operation of the tree name generator.
1776	**
1777	** Options:
1778	** --absolute Return an absolute path instead of a relative one
1779	** --case-sensitive B Enable or disable case-sensitive filenames. B is
1780	** a boolean: "yes", "no", "true", "false", etc.
1781	*/
1782	void cmd_test_tree_name(void){
1783	int i;
1784

M src/fileedit.c

+13 -14

		--- src/fileedit.c
		+++ src/fileedit.c
		@@ -698,37 +698,36 @@
698	698	**
699	699	** where FILENAME is a repo-relative name as it would appear in the
700	700	** vfile table.
701	701	**
702	702	** Options:
703		-**
704		-** -R\|--repository REPO The repository file to commit to.
	703	+** -R\|--repository REPO The repository file to commit to
705	704	** --as FILENAME The repository-side name of the input
706	705	** file, relative to the top of the
707	706	** repository. Default is the same as the
708	707	** input file name.
709		-** -m\|--comment COMMENT Required check-in comment.
710		-** -M\|--comment-file FILE Reads check-in comment from the given file.
	708	+** -m\|--comment COMMENT Required check-in comment
	709	+** -M\|--comment-file FILE Reads check-in comment from the given file
711	710	** -r\|--revision VERSION Commit from this version. Default is
712	711	** the check-out version (if available) or
713	712	** trunk (if used without a check-out).
714	713	** --allow-fork Allows the commit to be made against a
715	714	** non-leaf parent. Note that no autosync
716	715	** is performed beforehand.
717	716	** --allow-merge-conflict Allows check-in of a file even if it
718	717	** appears to contain a fossil merge conflict
719		-** marker.
	718	+** marker
720	719	** --user-override USER USER to use instead of the current
721		-** default.
722		-** --date-override DATETIME DATE to use instead of 'now'.
	720	+** default
	721	+** --date-override DATETIME DATE to use instead of 'now'
723	722	** --allow-older Allow a commit to be older than its
724		-** ancestor.
	723	+** ancestor
725	724	** --convert-eol-inherit Convert EOL style of the check-in to match
726		-** the previous version's content.
727		-** --convert-eol-unix Convert the EOL style to Unix.
	725	+** the previous version's content
	726	+** --convert-eol-unix Convert the EOL style to Unix
728	727	** --convert-eol-windows Convert the EOL style to Windows.
729		-** (only one of the --convert-eol-X options may be used and they only
	728	+** (Only one of the --convert-eol-X options may be used and they only
730	729	** modified the saved blob, not the input file.)
731	730	** --delta Prefer to generate a delta manifest, if
732	731	** able. The forbid-delta-manifests repo
733	732	** config option trumps this, as do certain
734	733	** heuristics.
		@@ -736,14 +735,14 @@
736	735	** Disabled by default to avoid that case-
737	736	** sensitivity errors inadvertently lead to
738	737	** adding a new file where an update is
739	738	** intended.
740	739	** -d\|--dump-manifest Dumps the generated manifest to stdout
741		-** immediately after it's generated.
	740	+** immediately after it's generated
742	741	** --save-manifest FILE Saves the generated manifest to a file
743		-** after successfully processing it.
744		-** --wet-run Disables the default dry-run mode.
	742	+** after successfully processing it
	743	+** --wet-run Disables the default dry-run mode
745	744	**
746	745	** Example:
747	746	**
748	747	** %fossil test-ci-mini -R REPO -m ... -r foo --as src/myfile.c myfile.c
749	748	**
750	749

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -698,37 +698,36 @@
698	**
699	** where FILENAME is a repo-relative name as it would appear in the
700	** vfile table.
701	**
702	** Options:
703	**
704	** -R\|--repository REPO The repository file to commit to.
705	** --as FILENAME The repository-side name of the input
706	** file, relative to the top of the
707	** repository. Default is the same as the
708	** input file name.
709	** -m\|--comment COMMENT Required check-in comment.
710	** -M\|--comment-file FILE Reads check-in comment from the given file.
711	** -r\|--revision VERSION Commit from this version. Default is
712	** the check-out version (if available) or
713	** trunk (if used without a check-out).
714	** --allow-fork Allows the commit to be made against a
715	** non-leaf parent. Note that no autosync
716	** is performed beforehand.
717	** --allow-merge-conflict Allows check-in of a file even if it
718	** appears to contain a fossil merge conflict
719	** marker.
720	** --user-override USER USER to use instead of the current
721	** default.
722	** --date-override DATETIME DATE to use instead of 'now'.
723	** --allow-older Allow a commit to be older than its
724	** ancestor.
725	** --convert-eol-inherit Convert EOL style of the check-in to match
726	** the previous version's content.
727	** --convert-eol-unix Convert the EOL style to Unix.
728	** --convert-eol-windows Convert the EOL style to Windows.
729	** (only one of the --convert-eol-X options may be used and they only
730	** modified the saved blob, not the input file.)
731	** --delta Prefer to generate a delta manifest, if
732	** able. The forbid-delta-manifests repo
733	** config option trumps this, as do certain
734	** heuristics.
	@@ -736,14 +735,14 @@
736	** Disabled by default to avoid that case-
737	** sensitivity errors inadvertently lead to
738	** adding a new file where an update is
739	** intended.
740	** -d\|--dump-manifest Dumps the generated manifest to stdout
741	** immediately after it's generated.
742	** --save-manifest FILE Saves the generated manifest to a file
743	** after successfully processing it.
744	** --wet-run Disables the default dry-run mode.
745	**
746	** Example:
747	**
748	** %fossil test-ci-mini -R REPO -m ... -r foo --as src/myfile.c myfile.c
749	**
750

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -698,37 +698,36 @@
698	**
699	** where FILENAME is a repo-relative name as it would appear in the
700	** vfile table.
701	**
702	** Options:
703	** -R\|--repository REPO The repository file to commit to

704	** --as FILENAME The repository-side name of the input
705	** file, relative to the top of the
706	** repository. Default is the same as the
707	** input file name.
708	** -m\|--comment COMMENT Required check-in comment
709	** -M\|--comment-file FILE Reads check-in comment from the given file
710	** -r\|--revision VERSION Commit from this version. Default is
711	** the check-out version (if available) or
712	** trunk (if used without a check-out).
713	** --allow-fork Allows the commit to be made against a
714	** non-leaf parent. Note that no autosync
715	** is performed beforehand.
716	** --allow-merge-conflict Allows check-in of a file even if it
717	** appears to contain a fossil merge conflict
718	** marker
719	** --user-override USER USER to use instead of the current
720	** default
721	** --date-override DATETIME DATE to use instead of 'now'
722	** --allow-older Allow a commit to be older than its
723	** ancestor
724	** --convert-eol-inherit Convert EOL style of the check-in to match
725	** the previous version's content
726	** --convert-eol-unix Convert the EOL style to Unix
727	** --convert-eol-windows Convert the EOL style to Windows.
728	** (Only one of the --convert-eol-X options may be used and they only
729	** modified the saved blob, not the input file.)
730	** --delta Prefer to generate a delta manifest, if
731	** able. The forbid-delta-manifests repo
732	** config option trumps this, as do certain
733	** heuristics.
	@@ -736,14 +735,14 @@
735	** Disabled by default to avoid that case-
736	** sensitivity errors inadvertently lead to
737	** adding a new file where an update is
738	** intended.
739	** -d\|--dump-manifest Dumps the generated manifest to stdout
740	** immediately after it's generated
741	** --save-manifest FILE Saves the generated manifest to a file
742	** after successfully processing it
743	** --wet-run Disables the default dry-run mode
744	**
745	** Example:
746	**
747	** %fossil test-ci-mini -R REPO -m ... -r foo --as src/myfile.c myfile.c
748	**
749

M src/http.c

-1

		--- src/http.c
		+++ src/http.c
		@@ -561,11 +561,10 @@
561	561	** is written into that second file instead of being written on standard
562	562	** output. Use the "--out OUTPUT" option to specify an output file for
563	563	** a GET request where there is no PAYLOAD.
564	564	**
565	565	** Options:
566		-**
567	566	** --compress Use ZLIB compression on the payload
568	567	** --mimetype TYPE Mimetype of the payload
569	568	** --out FILE Store the reply in FILE
570	569	** -v Verbose output
571	570	** --xfer PAYLOAD in a Fossil xfer protocol message
572	571

	--- src/http.c
	+++ src/http.c
	@@ -561,11 +561,10 @@
561	** is written into that second file instead of being written on standard
562	** output. Use the "--out OUTPUT" option to specify an output file for
563	** a GET request where there is no PAYLOAD.
564	**
565	** Options:
566	**
567	** --compress Use ZLIB compression on the payload
568	** --mimetype TYPE Mimetype of the payload
569	** --out FILE Store the reply in FILE
570	** -v Verbose output
571	** --xfer PAYLOAD in a Fossil xfer protocol message
572

	--- src/http.c
	+++ src/http.c
	@@ -561,11 +561,10 @@
561	** is written into that second file instead of being written on standard
562	** output. Use the "--out OUTPUT" option to specify an output file for
563	** a GET request where there is no PAYLOAD.
564	**
565	** Options:

566	** --compress Use ZLIB compression on the payload
567	** --mimetype TYPE Mimetype of the payload
568	** --out FILE Store the reply in FILE
569	** -v Verbose output
570	** --xfer PAYLOAD in a Fossil xfer protocol message
571

M src/info.c

-3

		--- src/info.c
		+++ src/info.c
		@@ -187,11 +187,10 @@
187	187	**
188	188	** Use the "finfo" command to get information about a specific
189	189	** file in a check-out.
190	190	**
191	191	** Options:
192		-**
193	192	** -R\|--repository REPO Extract info from repository REPO
194	193	** -v\|--verbose Show extra information about repositories
195	194	**
196	195	** See also: [[annotate]], [[artifact]], [[finfo]], [[timeline]]
197	196	*/
		@@ -3471,11 +3470,10 @@
3471	3470	** Usage: %fossil amend HASH OPTION ?OPTION ...?
3472	3471	**
3473	3472	** Amend the tags on check-in HASH to change how it displays in the timeline.
3474	3473	**
3475	3474	** Options:
3476		-**
3477	3475	** --author USER Make USER the author for check-in
3478	3476	** -m\|--comment COMMENT Make COMMENT the check-in comment
3479	3477	** -M\|--message-file FILE Read the amended comment from FILE
3480	3478	** -e\|--edit-comment Launch editor to revise comment
3481	3479	** --date DATETIME Make DATETIME the check-in time
		@@ -3813,11 +3811,10 @@
3813	3811	** If VERSION and the found ancestor refer to the same commit, the last two
3814	3812	** components are omitted, unless --long is provided. When no fitting tagged
3815	3813	** ancestor is found, show only the short hash of VERSION.
3816	3814	**
3817	3815	** Options:
3818		-**
3819	3816	** --digits Display so many hex digits of the hash
3820	3817	** (default: the larger of 6 and the 'hash-digit' setting)
3821	3818	** -d\|--dirty Show whether there are changes to be committed
3822	3819	** --long Always show all three components
3823	3820	** --match GLOB Consider only non-propagating tags matching GLOB
3824	3821

	--- src/info.c
	+++ src/info.c
	@@ -187,11 +187,10 @@
187	**
188	** Use the "finfo" command to get information about a specific
189	** file in a check-out.
190	**
191	** Options:
192	**
193	** -R\|--repository REPO Extract info from repository REPO
194	** -v\|--verbose Show extra information about repositories
195	**
196	** See also: [[annotate]], [[artifact]], [[finfo]], [[timeline]]
197	*/
	@@ -3471,11 +3470,10 @@
3471	** Usage: %fossil amend HASH OPTION ?OPTION ...?
3472	**
3473	** Amend the tags on check-in HASH to change how it displays in the timeline.
3474	**
3475	** Options:
3476	**
3477	** --author USER Make USER the author for check-in
3478	** -m\|--comment COMMENT Make COMMENT the check-in comment
3479	** -M\|--message-file FILE Read the amended comment from FILE
3480	** -e\|--edit-comment Launch editor to revise comment
3481	** --date DATETIME Make DATETIME the check-in time
	@@ -3813,11 +3811,10 @@
3813	** If VERSION and the found ancestor refer to the same commit, the last two
3814	** components are omitted, unless --long is provided. When no fitting tagged
3815	** ancestor is found, show only the short hash of VERSION.
3816	**
3817	** Options:
3818	**
3819	** --digits Display so many hex digits of the hash
3820	** (default: the larger of 6 and the 'hash-digit' setting)
3821	** -d\|--dirty Show whether there are changes to be committed
3822	** --long Always show all three components
3823	** --match GLOB Consider only non-propagating tags matching GLOB
3824

	--- src/info.c
	+++ src/info.c
	@@ -187,11 +187,10 @@
187	**
188	** Use the "finfo" command to get information about a specific
189	** file in a check-out.
190	**
191	** Options:

192	** -R\|--repository REPO Extract info from repository REPO
193	** -v\|--verbose Show extra information about repositories
194	**
195	** See also: [[annotate]], [[artifact]], [[finfo]], [[timeline]]
196	*/
	@@ -3471,11 +3470,10 @@
3470	** Usage: %fossil amend HASH OPTION ?OPTION ...?
3471	**
3472	** Amend the tags on check-in HASH to change how it displays in the timeline.
3473	**
3474	** Options:

3475	** --author USER Make USER the author for check-in
3476	** -m\|--comment COMMENT Make COMMENT the check-in comment
3477	** -M\|--message-file FILE Read the amended comment from FILE
3478	** -e\|--edit-comment Launch editor to revise comment
3479	** --date DATETIME Make DATETIME the check-in time
	@@ -3813,11 +3811,10 @@
3811	** If VERSION and the found ancestor refer to the same commit, the last two
3812	** components are omitted, unless --long is provided. When no fitting tagged
3813	** ancestor is found, show only the short hash of VERSION.
3814	**
3815	** Options:

3816	** --digits Display so many hex digits of the hash
3817	** (default: the larger of 6 and the 'hash-digit' setting)
3818	** -d\|--dirty Show whether there are changes to be committed
3819	** --long Always show all three components
3820	** --match GLOB Consider only non-propagating tags matching GLOB
3821

M src/main.c

+1 -1

		--- src/main.c
		+++ src/main.c
		@@ -2902,11 +2902,11 @@
2902	2902	** to use a different command for "ssh" sync, but we cannot do that without
2903	2903	** breaking legacy.
2904	2904	**
2905	2905	** Options:
2906	2906	** --test Do not do special "sync" processing when operating
2907		-** over an SSH link.
	2907	+** over an SSH link
2908	2908	** --th-trace Trace TH1 execution (for debugging purposes)
2909	2909	** --usercap CAP User capability string (Default: "sxy")
2910	2910	**
2911	2911	*/
2912	2912	void cmd_test_http(void){
2913	2913

	--- src/main.c
	+++ src/main.c
	@@ -2902,11 +2902,11 @@
2902	** to use a different command for "ssh" sync, but we cannot do that without
2903	** breaking legacy.
2904	**
2905	** Options:
2906	** --test Do not do special "sync" processing when operating
2907	** over an SSH link.
2908	** --th-trace Trace TH1 execution (for debugging purposes)
2909	** --usercap CAP User capability string (Default: "sxy")
2910	**
2911	*/
2912	void cmd_test_http(void){
2913

	--- src/main.c
	+++ src/main.c
	@@ -2902,11 +2902,11 @@
2902	** to use a different command for "ssh" sync, but we cannot do that without
2903	** breaking legacy.
2904	**
2905	** Options:
2906	** --test Do not do special "sync" processing when operating
2907	** over an SSH link
2908	** --th-trace Trace TH1 execution (for debugging purposes)
2909	** --usercap CAP User capability string (Default: "sxy")
2910	**
2911	*/
2912	void cmd_test_http(void){
2913

M src/manifest.c

-1

		--- src/manifest.c
		+++ src/manifest.c
		@@ -1290,11 +1290,10 @@
1290	1290	** artifacts and report any errors. Run this test command on historical
1291	1291	** repositories after making any changes to the manifest_parse()
1292	1292	** implementation to confirm that the changes did not break anything.
1293	1293	**
1294	1294	** Options:
1295		-**
1296	1295	** --limit N Parse no more than N artifacts before stopping
1297	1296	** --wellformed Use all BLOB table entries as input, not just
1298	1297	** those entries that are believed to be valid
1299	1298	** artifacts, and verify that the result the
1300	1299	** manifest_is_well_formed() agrees with the
1301	1300

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1290,11 +1290,10 @@
1290	** artifacts and report any errors. Run this test command on historical
1291	** repositories after making any changes to the manifest_parse()
1292	** implementation to confirm that the changes did not break anything.
1293	**
1294	** Options:
1295	**
1296	** --limit N Parse no more than N artifacts before stopping
1297	** --wellformed Use all BLOB table entries as input, not just
1298	** those entries that are believed to be valid
1299	** artifacts, and verify that the result the
1300	** manifest_is_well_formed() agrees with the
1301

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1290,11 +1290,10 @@
1290	** artifacts and report any errors. Run this test command on historical
1291	** repositories after making any changes to the manifest_parse()
1292	** implementation to confirm that the changes did not break anything.
1293	**
1294	** Options:

1295	** --limit N Parse no more than N artifacts before stopping
1296	** --wellformed Use all BLOB table entries as input, not just
1297	** those entries that are believed to be valid
1298	** artifacts, and verify that the result the
1299	** manifest_is_well_formed() agrees with the
1300

M src/merge.c

-10

		--- src/merge.c
		+++ src/merge.c
		@@ -295,41 +295,31 @@
295	295	** Only file content is merged. The result continues to use the
296	296	** file and directory names from the current check-out even if those
297	297	** names might have been changed in the branch being merged in.
298	298	**
299	299	** Options:
300		-**
301	300	** --backout Do a reverse cherrypick merge against VERSION.
302	301	** In other words, back out the changes that were
303	302	** added by VERSION.
304		-**
305	303	** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead
306	304	** of the nearest common ancestor. This allows
307	305	** a sequence of changes in a branch to be merged
308	306	** without having to merge the entire branch.
309		-**
310	307	** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
311	308	** and do not try to merge parallel changes. This
312	309	** option overrides the "binary-glob" setting.
313		-**
314	310	** --cherrypick Do a cherrypick merge VERSION into the current
315	311	** check-out. A cherrypick merge pulls in the changes
316	312	** of the single check-in VERSION, rather than all
317	313	** changes back to the nearest common ancestor.
318		-**
319	314	** -f\|--force Force the merge even if it would be a no-op
320		-**
321	315	** --force-missing Force the merge even if there is missing content
322		-**
323	316	** --integrate Merged branch will be closed when committing
324		-**
325	317	** -K\|--keep-merge-files On merge conflict, retain the temporary files
326	318	** used for merging, named -baseline, -original,
327	319	** and *-merge.
328		-**
329	320	** -n\|--dry-run If given, display instead of run actions
330		-**
331	321	** -v\|--verbose Show additional details of the merge
332	322	*/
333	323	void merge_cmd(void){
334	324	int vid; /* Current version "V" */
335	325	int mid; /* Version we are merging from "M" */
336	326

	--- src/merge.c
	+++ src/merge.c
	@@ -295,41 +295,31 @@
295	** Only file content is merged. The result continues to use the
296	** file and directory names from the current check-out even if those
297	** names might have been changed in the branch being merged in.
298	**
299	** Options:
300	**
301	** --backout Do a reverse cherrypick merge against VERSION.
302	** In other words, back out the changes that were
303	** added by VERSION.
304	**
305	** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead
306	** of the nearest common ancestor. This allows
307	** a sequence of changes in a branch to be merged
308	** without having to merge the entire branch.
309	**
310	** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
311	** and do not try to merge parallel changes. This
312	** option overrides the "binary-glob" setting.
313	**
314	** --cherrypick Do a cherrypick merge VERSION into the current
315	** check-out. A cherrypick merge pulls in the changes
316	** of the single check-in VERSION, rather than all
317	** changes back to the nearest common ancestor.
318	**
319	** -f\|--force Force the merge even if it would be a no-op
320	**
321	** --force-missing Force the merge even if there is missing content
322	**
323	** --integrate Merged branch will be closed when committing
324	**
325	** -K\|--keep-merge-files On merge conflict, retain the temporary files
326	** used for merging, named -baseline, -original,
327	** and *-merge.
328	**
329	** -n\|--dry-run If given, display instead of run actions
330	**
331	** -v\|--verbose Show additional details of the merge
332	*/
333	void merge_cmd(void){
334	int vid; /* Current version "V" */
335	int mid; /* Version we are merging from "M" */
336

	--- src/merge.c
	+++ src/merge.c
	@@ -295,41 +295,31 @@
295	** Only file content is merged. The result continues to use the
296	** file and directory names from the current check-out even if those
297	** names might have been changed in the branch being merged in.
298	**
299	** Options:

300	** --backout Do a reverse cherrypick merge against VERSION.
301	** In other words, back out the changes that were
302	** added by VERSION.

303	** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead
304	** of the nearest common ancestor. This allows
305	** a sequence of changes in a branch to be merged
306	** without having to merge the entire branch.

307	** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
308	** and do not try to merge parallel changes. This
309	** option overrides the "binary-glob" setting.

310	** --cherrypick Do a cherrypick merge VERSION into the current
311	** check-out. A cherrypick merge pulls in the changes
312	** of the single check-in VERSION, rather than all
313	** changes back to the nearest common ancestor.

314	** -f\|--force Force the merge even if it would be a no-op

315	** --force-missing Force the merge even if there is missing content

316	** --integrate Merged branch will be closed when committing

317	** -K\|--keep-merge-files On merge conflict, retain the temporary files
318	** used for merging, named -baseline, -original,
319	** and *-merge.

320	** -n\|--dry-run If given, display instead of run actions

321	** -v\|--verbose Show additional details of the merge
322	*/
323	void merge_cmd(void){
324	int vid; /* Current version "V" */
325	int mid; /* Version we are merging from "M" */
326

M src/name.c

-1

		--- src/name.c
		+++ src/name.c
		@@ -1063,11 +1063,10 @@
1063	1063	** Resolve the symbol NAME into its canonical artifact hash
1064	1064	** artifact name and provide a description of what role that artifact
1065	1065	** plays.
1066	1066	**
1067	1067	** Options:
1068		-**
1069	1068	** -f\|--file Find artifacts with the same hash as file NAME.
1070	1069	** If NAME is "-", read content from standard input.
1071	1070	** --type TYPE Only find artifacts of TYPE (one of: 'ci', 't',
1072	1071	** 'w', 'g', or 'e')
1073	1072	** -v\|--verbose Provide extra information (such as the RID)
1074	1073

	--- src/name.c
	+++ src/name.c
	@@ -1063,11 +1063,10 @@
1063	** Resolve the symbol NAME into its canonical artifact hash
1064	** artifact name and provide a description of what role that artifact
1065	** plays.
1066	**
1067	** Options:
1068	**
1069	** -f\|--file Find artifacts with the same hash as file NAME.
1070	** If NAME is "-", read content from standard input.
1071	** --type TYPE Only find artifacts of TYPE (one of: 'ci', 't',
1072	** 'w', 'g', or 'e')
1073	** -v\|--verbose Provide extra information (such as the RID)
1074

	--- src/name.c
	+++ src/name.c
	@@ -1063,11 +1063,10 @@
1063	** Resolve the symbol NAME into its canonical artifact hash
1064	** artifact name and provide a description of what role that artifact
1065	** plays.
1066	**
1067	** Options:

1068	** -f\|--file Find artifacts with the same hash as file NAME.
1069	** If NAME is "-", read content from standard input.
1070	** --type TYPE Only find artifacts of TYPE (one of: 'ci', 't',
1071	** 'w', 'g', or 'e')
1072	** -v\|--verbose Provide extra information (such as the RID)
1073

M src/patch.c

+3 -1

		--- src/patch.c
		+++ src/patch.c
		@@ -845,17 +845,19 @@
845	845	** Create a new binary patch in FILENAME that captures all uncommitted
846	846	** changes in the check-out at DIRECTORY, or the current directory if
847	847	** DIRECTORY is omitted. If FILENAME is "-" then the binary patch
848	848	** is written to standard output.
849	849	**
	850	+** Options:
850	851	** -f\|--force Overwrite an existing patch with the same name
851	852	**
852	853	** > fossil patch apply [DIRECTORY] FILENAME
853	854	**
854	855	** Apply the changes in FILENAME to the check-out at DIRECTORY, or
855		-** in the current directory if DIRECTORY is omitted. Options:
	856	+** in the current directory if DIRECTORY is omitted.
856	857	**
	858	+** Options:
857	859	** -f\|--force Apply the patch even though there are unsaved
858	860	** changes in the current check-out. Unsaved changes
859	861	** are reverted and permanently lost.
860	862	** -n\|--dry-run Do nothing, but print what would have happened
861	863	** -v\|--verbose Extra output explaining what happens
862	864

	--- src/patch.c
	+++ src/patch.c
	@@ -845,17 +845,19 @@
845	** Create a new binary patch in FILENAME that captures all uncommitted
846	** changes in the check-out at DIRECTORY, or the current directory if
847	** DIRECTORY is omitted. If FILENAME is "-" then the binary patch
848	** is written to standard output.
849	**

850	** -f\|--force Overwrite an existing patch with the same name
851	**
852	** > fossil patch apply [DIRECTORY] FILENAME
853	**
854	** Apply the changes in FILENAME to the check-out at DIRECTORY, or
855	** in the current directory if DIRECTORY is omitted. Options:
856	**

857	** -f\|--force Apply the patch even though there are unsaved
858	** changes in the current check-out. Unsaved changes
859	** are reverted and permanently lost.
860	** -n\|--dry-run Do nothing, but print what would have happened
861	** -v\|--verbose Extra output explaining what happens
862

	--- src/patch.c
	+++ src/patch.c
	@@ -845,17 +845,19 @@
845	** Create a new binary patch in FILENAME that captures all uncommitted
846	** changes in the check-out at DIRECTORY, or the current directory if
847	** DIRECTORY is omitted. If FILENAME is "-" then the binary patch
848	** is written to standard output.
849	**
850	** Options:
851	** -f\|--force Overwrite an existing patch with the same name
852	**
853	** > fossil patch apply [DIRECTORY] FILENAME
854	**
855	** Apply the changes in FILENAME to the check-out at DIRECTORY, or
856	** in the current directory if DIRECTORY is omitted.
857	**
858	** Options:
859	** -f\|--force Apply the patch even though there are unsaved
860	** changes in the current check-out. Unsaved changes
861	** are reverted and permanently lost.
862	** -n\|--dry-run Do nothing, but print what would have happened
863	** -v\|--verbose Extra output explaining what happens
864

M src/pikchrshow.c

-1

		--- src/pikchrshow.c
		+++ src/pikchrshow.c
		@@ -525,11 +525,10 @@
525	525	** an SVG graphic. The INFILE and OUTFILE options default to stdin
526	526	** resp. stdout, and the names "-" can be used as aliases for those
527	527	** streams.
528	528	**
529	529	** Options:
530		-**
531	530	** -div On success, add a DIV wrapper around the
532	531	** resulting SVG output which limits its max-width to
533	532	** its computed maximum ideal size
534	533	**
535	534	** -div-indent Like -div but indent the div
536	535

	--- src/pikchrshow.c
	+++ src/pikchrshow.c
	@@ -525,11 +525,10 @@
525	** an SVG graphic. The INFILE and OUTFILE options default to stdin
526	** resp. stdout, and the names "-" can be used as aliases for those
527	** streams.
528	**
529	** Options:
530	**
531	** -div On success, add a DIV wrapper around the
532	** resulting SVG output which limits its max-width to
533	** its computed maximum ideal size
534	**
535	** -div-indent Like -div but indent the div
536

	--- src/pikchrshow.c
	+++ src/pikchrshow.c
	@@ -525,11 +525,10 @@
525	** an SVG graphic. The INFILE and OUTFILE options default to stdin
526	** resp. stdout, and the names "-" can be used as aliases for those
527	** streams.
528	**
529	** Options:

530	** -div On success, add a DIV wrapper around the
531	** resulting SVG output which limits its max-width to
532	** its computed maximum ideal size
533	**
534	** -div-indent Like -div but indent the div
535

M src/publish.c

+1 -1

		--- src/publish.c
		+++ src/publish.c
		@@ -31,11 +31,11 @@
31	31	** will never push and hence will not be shared with collaborators.
32	32	**
33	33	** By default, this command only shows unpublished check-ins. To show
34	34	** all unpublished artifacts, use the --all command-line option.
35	35	**
36		-** OPTIONS:
	36	+** Options:
37	37	** --all Show all artifacts, not just check-ins
38	38	*/
39	39	void unpublished_cmd(void){
40	40	int bAll = find_option("all",0,0)!=0;
41	41
42	42

	--- src/publish.c
	+++ src/publish.c
	@@ -31,11 +31,11 @@
31	** will never push and hence will not be shared with collaborators.
32	**
33	** By default, this command only shows unpublished check-ins. To show
34	** all unpublished artifacts, use the --all command-line option.
35	**
36	** OPTIONS:
37	** --all Show all artifacts, not just check-ins
38	*/
39	void unpublished_cmd(void){
40	int bAll = find_option("all",0,0)!=0;
41
42

	--- src/publish.c
	+++ src/publish.c
	@@ -31,11 +31,11 @@
31	** will never push and hence will not be shared with collaborators.
32	**
33	** By default, this command only shows unpublished check-ins. To show
34	** all unpublished artifacts, use the --all command-line option.
35	**
36	** Options:
37	** --all Show all artifacts, not just check-ins
38	*/
39	void unpublished_cmd(void){
40	int bAll = find_option("all",0,0)!=0;
41
42

M src/regexp.c

-2

		--- src/regexp.c
		+++ src/regexp.c
		@@ -809,11 +809,10 @@
809	809	**
810	810	** Run a regular expression match over the named disk files, or against
811	811	** standard input if no disk files are named on the command-line.
812	812	**
813	813	** Options:
814		-**
815	814	** -i\|--ignore-case Ignore case
816	815	*/
817	816	void re_test_grep(void){
818	817	ReCompiled *pRe;
819	818	const char *zErr;
		@@ -853,11 +852,10 @@
853	852	**
854	853	** For details of the supported regular expression dialect, see
855	854	** https://fossil-scm.org/fossil/doc/trunk/www/grep.md
856	855	**
857	856	** Options:
858		-**
859	857	** -c\|--count Suppress normal output; instead print a count
860	858	** of the number of matching files
861	859	** -i\|--ignore-case Ignore case
862	860	** -l\|--files-with-matches List only hash for each match
863	861	** --once Stop searching after the first match
864	862

	--- src/regexp.c
	+++ src/regexp.c
	@@ -809,11 +809,10 @@
809	**
810	** Run a regular expression match over the named disk files, or against
811	** standard input if no disk files are named on the command-line.
812	**
813	** Options:
814	**
815	** -i\|--ignore-case Ignore case
816	*/
817	void re_test_grep(void){
818	ReCompiled *pRe;
819	const char *zErr;
	@@ -853,11 +852,10 @@
853	**
854	** For details of the supported regular expression dialect, see
855	** https://fossil-scm.org/fossil/doc/trunk/www/grep.md
856	**
857	** Options:
858	**
859	** -c\|--count Suppress normal output; instead print a count
860	** of the number of matching files
861	** -i\|--ignore-case Ignore case
862	** -l\|--files-with-matches List only hash for each match
863	** --once Stop searching after the first match
864

	--- src/regexp.c
	+++ src/regexp.c
	@@ -809,11 +809,10 @@
809	**
810	** Run a regular expression match over the named disk files, or against
811	** standard input if no disk files are named on the command-line.
812	**
813	** Options:

814	** -i\|--ignore-case Ignore case
815	*/
816	void re_test_grep(void){
817	ReCompiled *pRe;
818	const char *zErr;
	@@ -853,11 +852,10 @@
852	**
853	** For details of the supported regular expression dialect, see
854	** https://fossil-scm.org/fossil/doc/trunk/www/grep.md
855	**
856	** Options:

857	** -c\|--count Suppress normal output; instead print a count
858	** of the number of matching files
859	** -i\|--ignore-case Ignore case
860	** -l\|--files-with-matches List only hash for each match
861	** --once Stop searching after the first match
862

M src/rss.c

+2 -1

		--- src/rss.c
		+++ src/rss.c
		@@ -230,12 +230,13 @@
230	230	** COMMAND: rss*
231	231	**
232	232	** Usage: %fossil rss ?OPTIONS?
233	233	**
234	234	** The CLI variant of the /timeline.rss page, this produces an RSS
235		-** feed of the timeline to stdout. Options:
	235	+** feed of the timeline to stdout.
236	236	**
	237	+** Options:
237	238	** -type\|y FLAG May be: all (default), ci (show check-ins only),
238	239	** t (show tickets only), w (show wiki only)
239	240	**
240	241	** -limit\|n LIMIT The maximum number of items to show
241	242	**
242	243

	--- src/rss.c
	+++ src/rss.c
	@@ -230,12 +230,13 @@
230	** COMMAND: rss*
231	**
232	** Usage: %fossil rss ?OPTIONS?
233	**
234	** The CLI variant of the /timeline.rss page, this produces an RSS
235	** feed of the timeline to stdout. Options:
236	**

237	** -type\|y FLAG May be: all (default), ci (show check-ins only),
238	** t (show tickets only), w (show wiki only)
239	**
240	** -limit\|n LIMIT The maximum number of items to show
241	**
242

	--- src/rss.c
	+++ src/rss.c
	@@ -230,12 +230,13 @@
230	** COMMAND: rss*
231	**
232	** Usage: %fossil rss ?OPTIONS?
233	**
234	** The CLI variant of the /timeline.rss page, this produces an RSS
235	** feed of the timeline to stdout.
236	**
237	** Options:
238	** -type\|y FLAG May be: all (default), ci (show check-ins only),
239	** t (show tickets only), w (show wiki only)
240	**
241	** -limit\|n LIMIT The maximum number of items to show
242	**
243

M src/search.c

-2

		--- src/search.c
		+++ src/search.c
		@@ -334,11 +334,10 @@
334	334	**
335	335	** Run the full-scan search algorithm using SEARCHSTRING against
336	336	** the text of the files listed. Output matches and snippets.
337	337	**
338	338	** Options:
339		-**
340	339	** --begin TEXT Text to insert before each match
341	340	** --end TEXT Text to insert after each match
342	341	** --gap TEXT Text to indicate elided content
343	342	** --html Input is HTML
344	343	** --static Use the static Search object
		@@ -583,11 +582,10 @@
583	582	** score. The -limit option can be used to limit the number of entries
584	583	** returned. The -width option can be used to set the output width used
585	584	** when printing matches.
586	585	**
587	586	** Options:
588		-**
589	587	** -a\|--all Output all matches, not just best matches
590	588	** -n\|--limit N Limit output to N matches
591	589	** -W\|--width WIDTH Set display width to WIDTH columns, 0 for
592	590	** unlimited. Defaults the terminal's width.
593	591	*/
594	592

	--- src/search.c
	+++ src/search.c
	@@ -334,11 +334,10 @@
334	**
335	** Run the full-scan search algorithm using SEARCHSTRING against
336	** the text of the files listed. Output matches and snippets.
337	**
338	** Options:
339	**
340	** --begin TEXT Text to insert before each match
341	** --end TEXT Text to insert after each match
342	** --gap TEXT Text to indicate elided content
343	** --html Input is HTML
344	** --static Use the static Search object
	@@ -583,11 +582,10 @@
583	** score. The -limit option can be used to limit the number of entries
584	** returned. The -width option can be used to set the output width used
585	** when printing matches.
586	**
587	** Options:
588	**
589	** -a\|--all Output all matches, not just best matches
590	** -n\|--limit N Limit output to N matches
591	** -W\|--width WIDTH Set display width to WIDTH columns, 0 for
592	** unlimited. Defaults the terminal's width.
593	*/
594

	--- src/search.c
	+++ src/search.c
	@@ -334,11 +334,10 @@
334	**
335	** Run the full-scan search algorithm using SEARCHSTRING against
336	** the text of the files listed. Output matches and snippets.
337	**
338	** Options:

339	** --begin TEXT Text to insert before each match
340	** --end TEXT Text to insert after each match
341	** --gap TEXT Text to indicate elided content
342	** --html Input is HTML
343	** --static Use the static Search object
	@@ -583,11 +582,10 @@
582	** score. The -limit option can be used to limit the number of entries
583	** returned. The -width option can be used to set the output width used
584	** when printing matches.
585	**
586	** Options:

587	** -a\|--all Output all matches, not just best matches
588	** -n\|--limit N Limit output to N matches
589	** -W\|--width WIDTH Set display width to WIDTH columns, 0 for
590	** unlimited. Defaults the terminal's width.
591	*/
592

M src/sha1.c

+1 -1

		--- src/sha1.c
		+++ src/sha1.c
		@@ -501,12 +501,12 @@
501	501	**
502	502	** Usage: %fossil sha1sum FILE...
503	503	**
504	504	** Compute an SHA1 checksum of all files named on the command-line.
505	505	** If a file is named "-" then take its content from standard input.
506		-** Options:
507	506	**
	507	+** Options:
508	508	** -h\|--dereference If FILE is a symbolic link, compute the hash
509	509	** on the object that the link points to. Normally,
510	510	** the hash is over the name of the object that
511	511	** the link points to.
512	512	**
513	513

	--- src/sha1.c
	+++ src/sha1.c
	@@ -501,12 +501,12 @@
501	**
502	** Usage: %fossil sha1sum FILE...
503	**
504	** Compute an SHA1 checksum of all files named on the command-line.
505	** If a file is named "-" then take its content from standard input.
506	** Options:
507	**

508	** -h\|--dereference If FILE is a symbolic link, compute the hash
509	** on the object that the link points to. Normally,
510	** the hash is over the name of the object that
511	** the link points to.
512	**
513

	--- src/sha1.c
	+++ src/sha1.c
	@@ -501,12 +501,12 @@
501	**
502	** Usage: %fossil sha1sum FILE...
503	**
504	** Compute an SHA1 checksum of all files named on the command-line.
505	** If a file is named "-" then take its content from standard input.

506	**
507	** Options:
508	** -h\|--dereference If FILE is a symbolic link, compute the hash
509	** on the object that the link points to. Normally,
510	** the hash is over the name of the object that
511	** the link points to.
512	**
513

M src/sha3.c

-1

		--- src/sha3.c
		+++ src/sha3.c
		@@ -628,11 +628,10 @@
628	628	**
629	629	** To be clear: The official NIST FIPS-202 implementation of SHA3
630	630	** with the added 01 padding is used, not the original Keccak submission.
631	631	**
632	632	** Options:
633		-**
634	633	** --224 Compute a SHA3-224 hash
635	634	** --256 Compute a SHA3-256 hash (the default)
636	635	** --384 Compute a SHA3-384 hash
637	636	** --512 Compute a SHA3-512 hash
638	637	** --size N An N-bit hash. N must be a multiple of 32 between
639	638

	--- src/sha3.c
	+++ src/sha3.c
	@@ -628,11 +628,10 @@
628	**
629	** To be clear: The official NIST FIPS-202 implementation of SHA3
630	** with the added 01 padding is used, not the original Keccak submission.
631	**
632	** Options:
633	**
634	** --224 Compute a SHA3-224 hash
635	** --256 Compute a SHA3-256 hash (the default)
636	** --384 Compute a SHA3-384 hash
637	** --512 Compute a SHA3-512 hash
638	** --size N An N-bit hash. N must be a multiple of 32 between
639

	--- src/sha3.c
	+++ src/sha3.c
	@@ -628,11 +628,10 @@
628	**
629	** To be clear: The official NIST FIPS-202 implementation of SHA3
630	** with the added 01 padding is used, not the original Keccak submission.
631	**
632	** Options:

633	** --224 Compute a SHA3-224 hash
634	** --256 Compute a SHA3-256 hash (the default)
635	** --384 Compute a SHA3-384 hash
636	** --512 Compute a SHA3-512 hash
637	** --size N An N-bit hash. N must be a multiple of 32 between
638

M src/smtp.c

-2

		--- src/smtp.c
		+++ src/smtp.c
		@@ -423,11 +423,10 @@
423	423	** Interact with the SMTP server for DOMAIN by setting up a connection
424	424	** and then immediately shutting it back down. Log all interaction
425	425	** on the console. Use ME as the domain name of the sender.
426	426	**
427	427	** Options:
428		-**
429	428	** --direct Use DOMAIN directly without going through MX
430	429	** --port N Talk on TCP port N
431	430	*/
432	431	void test_smtp_probe(void){
433	432	SmtpSession *p;
		@@ -596,11 +595,10 @@
596	595	**
597	596	** Use SMTP to send the email message contained in the file named EMAIL
598	597	** to the list of users TO. FROM is the sender of the email.
599	598	**
600	599	** Options:
601		-**
602	600	** --direct Go directly to the TO domain. Bypass MX lookup
603	601	** --relayhost R Use R as relay host directly for delivery.
604	602	** --port N Use TCP port N instead of 25
605	603	** --trace Show the SMTP conversation on the console
606	604	*/
607	605

	--- src/smtp.c
	+++ src/smtp.c
	@@ -423,11 +423,10 @@
423	** Interact with the SMTP server for DOMAIN by setting up a connection
424	** and then immediately shutting it back down. Log all interaction
425	** on the console. Use ME as the domain name of the sender.
426	**
427	** Options:
428	**
429	** --direct Use DOMAIN directly without going through MX
430	** --port N Talk on TCP port N
431	*/
432	void test_smtp_probe(void){
433	SmtpSession *p;
	@@ -596,11 +595,10 @@
596	**
597	** Use SMTP to send the email message contained in the file named EMAIL
598	** to the list of users TO. FROM is the sender of the email.
599	**
600	** Options:
601	**
602	** --direct Go directly to the TO domain. Bypass MX lookup
603	** --relayhost R Use R as relay host directly for delivery.
604	** --port N Use TCP port N instead of 25
605	** --trace Show the SMTP conversation on the console
606	*/
607

	--- src/smtp.c
	+++ src/smtp.c
	@@ -423,11 +423,10 @@
423	** Interact with the SMTP server for DOMAIN by setting up a connection
424	** and then immediately shutting it back down. Log all interaction
425	** on the console. Use ME as the domain name of the sender.
426	**
427	** Options:

428	** --direct Use DOMAIN directly without going through MX
429	** --port N Talk on TCP port N
430	*/
431	void test_smtp_probe(void){
432	SmtpSession *p;
	@@ -596,11 +595,10 @@
595	**
596	** Use SMTP to send the email message contained in the file named EMAIL
597	** to the list of users TO. FROM is the sender of the email.
598	**
599	** Options:

600	** --direct Go directly to the TO domain. Bypass MX lookup
601	** --relayhost R Use R as relay host directly for delivery.
602	** --port N Use TCP port N instead of 25
603	** --trace Show the SMTP conversation on the console
604	*/
605

M src/sqlcmd.c

-4

		--- src/sqlcmd.c
		+++ src/sqlcmd.c
		@@ -332,19 +332,15 @@
332	332	** in ways that are unrecoverable. Be sure you know what you are doing before
333	333	** running any SQL commands that modify the repository database. Use the
334	334	** --readonly option to prevent accidental damage to the repository.
335	335	**
336	336	** Options:
337		-**
338	337	** --no-repository Skip opening the repository database
339		-**
340	338	** --readonly Open the repository read-only. No changes
341	339	** are allowed. This is a recommended safety
342	340	** precaution to prevent repository damage.
343		-**
344	341	** -R REPOSITORY Use REPOSITORY as the repository database
345		-**
346	342	** --test Enable some testing and analysis features
347	343	** that are normally disabled.
348	344	**
349	345	** All of the standard sqlite3 command-line shell options should also
350	346	** work.
351	347

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -332,19 +332,15 @@
332	** in ways that are unrecoverable. Be sure you know what you are doing before
333	** running any SQL commands that modify the repository database. Use the
334	** --readonly option to prevent accidental damage to the repository.
335	**
336	** Options:
337	**
338	** --no-repository Skip opening the repository database
339	**
340	** --readonly Open the repository read-only. No changes
341	** are allowed. This is a recommended safety
342	** precaution to prevent repository damage.
343	**
344	** -R REPOSITORY Use REPOSITORY as the repository database
345	**
346	** --test Enable some testing and analysis features
347	** that are normally disabled.
348	**
349	** All of the standard sqlite3 command-line shell options should also
350	** work.
351

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -332,19 +332,15 @@
332	** in ways that are unrecoverable. Be sure you know what you are doing before
333	** running any SQL commands that modify the repository database. Use the
334	** --readonly option to prevent accidental damage to the repository.
335	**
336	** Options:

337	** --no-repository Skip opening the repository database

338	** --readonly Open the repository read-only. No changes
339	** are allowed. This is a recommended safety
340	** precaution to prevent repository damage.

341	** -R REPOSITORY Use REPOSITORY as the repository database

342	** --test Enable some testing and analysis features
343	** that are normally disabled.
344	**
345	** All of the standard sqlite3 command-line shell options should also
346	** work.
347

M src/stat.c

-1

		--- src/stat.c
		+++ src/stat.c
		@@ -333,11 +333,10 @@
333	333	**
334	334	** Shows statistics and global information about the repository and/or
335	335	** verify the integrity of a repository.
336	336	**
337	337	** Options:
338		-**
339	338	** -b\|--brief Only show essential elements
340	339	** --db-check Run "PRAGMA quick_check" on the repository database
341	340	** --db-verify Run a full verification of the repository integrity.
342	341	** This involves decoding and reparsing all artifacts
343	342	** and can take significant time.
344	343

	--- src/stat.c
	+++ src/stat.c
	@@ -333,11 +333,10 @@
333	**
334	** Shows statistics and global information about the repository and/or
335	** verify the integrity of a repository.
336	**
337	** Options:
338	**
339	** -b\|--brief Only show essential elements
340	** --db-check Run "PRAGMA quick_check" on the repository database
341	** --db-verify Run a full verification of the repository integrity.
342	** This involves decoding and reparsing all artifacts
343	** and can take significant time.
344

	--- src/stat.c
	+++ src/stat.c
	@@ -333,11 +333,10 @@
333	**
334	** Shows statistics and global information about the repository and/or
335	** verify the integrity of a repository.
336	**
337	** Options:

338	** -b\|--brief Only show essential elements
339	** --db-check Run "PRAGMA quick_check" on the repository database
340	** --db-verify Run a full verification of the repository integrity.
341	** This involves decoding and reparsing all artifacts
342	** and can take significant time.
343

M src/sync.c

-4

		--- src/sync.c
		+++ src/sync.c
		@@ -319,11 +319,10 @@
319	319	** If URL is not specified, then the URL from the most recent clone, push,
320	320	** pull, remote, or sync command is used. See "fossil help clone" for
321	321	** details on the URL formats.
322	322	**
323	323	** Options:
324		-**
325	324	** --all Pull from all remotes, not just the default
326	325	** -B\|--httpauth USER:PASS Credentials for the simple HTTP auth protocol,
327	326	** if required by the remote website
328	327	** --from-parent-project Pull content from the parent project
329	328	** --ipv4 Use only IPv4, not IPv6
		@@ -374,11 +373,10 @@
374	373	** If URL is not specified, then the URL from the most recent clone, push,
375	374	** pull, remote, or sync command is used. See "fossil help clone" for
376	375	** details on the URL formats.
377	376	**
378	377	** Options:
379		-**
380	378	** --all Push to all remotes, not just the default
381	379	** -B\|--httpauth USER:PASS Credentials for the simple HTTP auth protocol,
382	380	** if required by the remote website
383	381	** --ipv4 Use only IPv4, not IPv6
384	382	** --no-http-compression Do not compress HTTP traffic
		@@ -423,11 +421,10 @@
423	421	** If URL is not specified, then the URL from the most recent clone, push,
424	422	** pull, remote, or sync command is used. See "fossil help clone" for
425	423	** details on the URL formats.
426	424	**
427	425	** Options:
428		-**
429	426	** --all Sync with all remotes, not just the default
430	427	** -B\|--httpauth USER:PASS Credentials for the simple HTTP auth protocol,
431	428	** if required by the remote website
432	429	** --ipv4 Use only IPv4, not IPv6
433	430	** --no-http-compression Do not compress HTTP traffic
		@@ -831,11 +828,10 @@
831	828	** Only the main repository database is backed up by this command. The
832	829	** open check-out file (if any) is not saved. Nor is the global configuration
833	830	** database.
834	831	**
835	832	** Options:
836		-**
837	833	** --overwrite OK to overwrite an existing file
838	834	** -R NAME Filename of the repository to backup
839	835	*/
840	836	void backup_cmd(void){
841	837	char *zDest;
842	838

	--- src/sync.c
	+++ src/sync.c
	@@ -319,11 +319,10 @@
319	** If URL is not specified, then the URL from the most recent clone, push,
320	** pull, remote, or sync command is used. See "fossil help clone" for
321	** details on the URL formats.
322	**
323	** Options:
324	**
325	** --all Pull from all remotes, not just the default
326	** -B\|--httpauth USER:PASS Credentials for the simple HTTP auth protocol,
327	** if required by the remote website
328	** --from-parent-project Pull content from the parent project
329	** --ipv4 Use only IPv4, not IPv6
	@@ -374,11 +373,10 @@
374	** If URL is not specified, then the URL from the most recent clone, push,
375	** pull, remote, or sync command is used. See "fossil help clone" for
376	** details on the URL formats.
377	**
378	** Options:
379	**
380	** --all Push to all remotes, not just the default
381	** -B\|--httpauth USER:PASS Credentials for the simple HTTP auth protocol,
382	** if required by the remote website
383	** --ipv4 Use only IPv4, not IPv6
384	** --no-http-compression Do not compress HTTP traffic
	@@ -423,11 +421,10 @@
423	** If URL is not specified, then the URL from the most recent clone, push,
424	** pull, remote, or sync command is used. See "fossil help clone" for
425	** details on the URL formats.
426	**
427	** Options:
428	**
429	** --all Sync with all remotes, not just the default
430	** -B\|--httpauth USER:PASS Credentials for the simple HTTP auth protocol,
431	** if required by the remote website
432	** --ipv4 Use only IPv4, not IPv6
433	** --no-http-compression Do not compress HTTP traffic
	@@ -831,11 +828,10 @@
831	** Only the main repository database is backed up by this command. The
832	** open check-out file (if any) is not saved. Nor is the global configuration
833	** database.
834	**
835	** Options:
836	**
837	** --overwrite OK to overwrite an existing file
838	** -R NAME Filename of the repository to backup
839	*/
840	void backup_cmd(void){
841	char *zDest;
842

	--- src/sync.c
	+++ src/sync.c
	@@ -319,11 +319,10 @@
319	** If URL is not specified, then the URL from the most recent clone, push,
320	** pull, remote, or sync command is used. See "fossil help clone" for
321	** details on the URL formats.
322	**
323	** Options:

324	** --all Pull from all remotes, not just the default
325	** -B\|--httpauth USER:PASS Credentials for the simple HTTP auth protocol,
326	** if required by the remote website
327	** --from-parent-project Pull content from the parent project
328	** --ipv4 Use only IPv4, not IPv6
	@@ -374,11 +373,10 @@
373	** If URL is not specified, then the URL from the most recent clone, push,
374	** pull, remote, or sync command is used. See "fossil help clone" for
375	** details on the URL formats.
376	**
377	** Options:

378	** --all Push to all remotes, not just the default
379	** -B\|--httpauth USER:PASS Credentials for the simple HTTP auth protocol,
380	** if required by the remote website
381	** --ipv4 Use only IPv4, not IPv6
382	** --no-http-compression Do not compress HTTP traffic
	@@ -423,11 +421,10 @@
421	** If URL is not specified, then the URL from the most recent clone, push,
422	** pull, remote, or sync command is used. See "fossil help clone" for
423	** details on the URL formats.
424	**
425	** Options:

426	** --all Sync with all remotes, not just the default
427	** -B\|--httpauth USER:PASS Credentials for the simple HTTP auth protocol,
428	** if required by the remote website
429	** --ipv4 Use only IPv4, not IPv6
430	** --no-http-compression Do not compress HTTP traffic
	@@ -831,11 +828,10 @@
828	** Only the main repository database is backed up by this command. The
829	** open check-out file (if any) is not saved. Nor is the global configuration
830	** database.
831	**
832	** Options:

833	** --overwrite OK to overwrite an existing file
834	** -R NAME Filename of the repository to backup
835	*/
836	void backup_cmd(void){
837	char *zDest;
838

M src/th_main.c

-4

		--- src/th_main.c
		+++ src/th_main.c
		@@ -2939,11 +2939,10 @@
2939	2939	** Read the content of the file named "FILE" as if it were a header or
2940	2940	** footer or ticket rendering script, evaluate it, and show the results
2941	2941	** on standard output.
2942	2942	**
2943	2943	** Options:
2944		-**
2945	2944	** --cgi Include a CGI response header in the output
2946	2945	** --http Include an HTTP response header in the output
2947	2946	** --open-config Open the configuration database
2948	2947	** --set-anon-caps Set anonymous login capabilities
2949	2948	** --set-user-caps Set user login capabilities
		@@ -2989,11 +2988,10 @@
2989	2988	** Evaluate SCRIPT as if it were a header or footer or ticket rendering
2990	2989	** script and show the results on standard output. SCRIPT may be either
2991	2990	** a filename or a string of th1 script code.
2992	2991	**
2993	2992	** Options:
2994		-**
2995	2993	** --cgi Include a CGI response header in the output
2996	2994	** --http Include an HTTP response header in the output
2997	2995	** --open-config Open the configuration database
2998	2996	** --set-anon-caps Set anonymous login capabilities
2999	2997	** --set-user-caps Set user login capabilities
		@@ -3050,11 +3048,10 @@
3050	3048	** Evaluate the contents of the file named "FILE" as if it were a header
3051	3049	** or footer or ticket rendering script and show the results on standard
3052	3050	** output.
3053	3051	**
3054	3052	** Options:
3055		-**
3056	3053	** --cgi Include a CGI response header in the output
3057	3054	** --http Include an HTTP response header in the output
3058	3055	** --open-config Open the configuration database
3059	3056	** --set-anon-caps Set anonymous login capabilities
3060	3057	** --set-user-caps Set user login capabilities
		@@ -3133,11 +3130,10 @@
3133	3130	** webnotify Executes the TH1 procedure [webpage_notify], after
3134	3131	** setting the TH1 variables "web_name", "web_args",
3135	3132	** and "web_flags" to appropriate values.
3136	3133	**
3137	3134	** Options:
3138		-**
3139	3135	** --cgi Include a CGI response header in the output
3140	3136	** --http Include an HTTP response header in the output
3141	3137	** --th-trace Trace TH1 execution (for debugging purposes)
3142	3138	*/
3143	3139	void test_th_hook(void){
3144	3140

	--- src/th_main.c
	+++ src/th_main.c
	@@ -2939,11 +2939,10 @@
2939	** Read the content of the file named "FILE" as if it were a header or
2940	** footer or ticket rendering script, evaluate it, and show the results
2941	** on standard output.
2942	**
2943	** Options:
2944	**
2945	** --cgi Include a CGI response header in the output
2946	** --http Include an HTTP response header in the output
2947	** --open-config Open the configuration database
2948	** --set-anon-caps Set anonymous login capabilities
2949	** --set-user-caps Set user login capabilities
	@@ -2989,11 +2988,10 @@
2989	** Evaluate SCRIPT as if it were a header or footer or ticket rendering
2990	** script and show the results on standard output. SCRIPT may be either
2991	** a filename or a string of th1 script code.
2992	**
2993	** Options:
2994	**
2995	** --cgi Include a CGI response header in the output
2996	** --http Include an HTTP response header in the output
2997	** --open-config Open the configuration database
2998	** --set-anon-caps Set anonymous login capabilities
2999	** --set-user-caps Set user login capabilities
	@@ -3050,11 +3048,10 @@
3050	** Evaluate the contents of the file named "FILE" as if it were a header
3051	** or footer or ticket rendering script and show the results on standard
3052	** output.
3053	**
3054	** Options:
3055	**
3056	** --cgi Include a CGI response header in the output
3057	** --http Include an HTTP response header in the output
3058	** --open-config Open the configuration database
3059	** --set-anon-caps Set anonymous login capabilities
3060	** --set-user-caps Set user login capabilities
	@@ -3133,11 +3130,10 @@
3133	** webnotify Executes the TH1 procedure [webpage_notify], after
3134	** setting the TH1 variables "web_name", "web_args",
3135	** and "web_flags" to appropriate values.
3136	**
3137	** Options:
3138	**
3139	** --cgi Include a CGI response header in the output
3140	** --http Include an HTTP response header in the output
3141	** --th-trace Trace TH1 execution (for debugging purposes)
3142	*/
3143	void test_th_hook(void){
3144

	--- src/th_main.c
	+++ src/th_main.c
	@@ -2939,11 +2939,10 @@
2939	** Read the content of the file named "FILE" as if it were a header or
2940	** footer or ticket rendering script, evaluate it, and show the results
2941	** on standard output.
2942	**
2943	** Options:

2944	** --cgi Include a CGI response header in the output
2945	** --http Include an HTTP response header in the output
2946	** --open-config Open the configuration database
2947	** --set-anon-caps Set anonymous login capabilities
2948	** --set-user-caps Set user login capabilities
	@@ -2989,11 +2988,10 @@
2988	** Evaluate SCRIPT as if it were a header or footer or ticket rendering
2989	** script and show the results on standard output. SCRIPT may be either
2990	** a filename or a string of th1 script code.
2991	**
2992	** Options:

2993	** --cgi Include a CGI response header in the output
2994	** --http Include an HTTP response header in the output
2995	** --open-config Open the configuration database
2996	** --set-anon-caps Set anonymous login capabilities
2997	** --set-user-caps Set user login capabilities
	@@ -3050,11 +3048,10 @@
3048	** Evaluate the contents of the file named "FILE" as if it were a header
3049	** or footer or ticket rendering script and show the results on standard
3050	** output.
3051	**
3052	** Options:

3053	** --cgi Include a CGI response header in the output
3054	** --http Include an HTTP response header in the output
3055	** --open-config Open the configuration database
3056	** --set-anon-caps Set anonymous login capabilities
3057	** --set-user-caps Set user login capabilities
	@@ -3133,11 +3130,10 @@
3130	** webnotify Executes the TH1 procedure [webpage_notify], after
3131	** setting the TH1 variables "web_name", "web_args",
3132	** and "web_flags" to appropriate values.
3133	**
3134	** Options:

3135	** --cgi Include a CGI response header in the output
3136	** --http Include an HTTP response header in the output
3137	** --th-trace Trace TH1 execution (for debugging purposes)
3138	*/
3139	void test_th_hook(void){
3140

M src/unversioned.c

+4 -3

		--- src/unversioned.c
		+++ src/unversioned.c
		@@ -250,12 +250,13 @@
250	250	** edit FILE Bring up FILE in a text editor for modification.
251	251	**
252	252	** export FILE OUTPUT Write the content of FILE into OUTPUT on disk
253	253	**
254	254	** list \| ls Show all unversioned files held in the local
255		-** repository. Options:
	255	+** repository.
256	256	**
	257	+** Options:
257	258	** --glob PATTERN Show only files that match
258	259	** --like PATTERN Show only files that match
259	260	** -l Show additional details for
260	261	** files that match. Implied
261	262	** when 'list' is used.
		@@ -269,12 +270,13 @@
269	270	** -n\|--dry-run Show what would have happened
270	271	**
271	272	** remove\|rm\|delete FILE ...
272	273	** Remove unversioned files from the local repository.
273	274	** Changes are not pushed to other repositories until
274		-** the next sync. Options:
	275	+** the next sync.
275	276	**
	277	+** Options:
276	278	** --glob PATTERN Remove files that match
277	279	** --like PATTERN Remove files that match
278	280	**
279	281	** sync ?URL? Synchronize the state of all unversioned files with
280	282	** the remote repository URL. The most recent version
		@@ -286,11 +288,10 @@
286	288	** -n\|--dry-run Show what would have happened
287	289	**
288	290	** touch FILE ... Update the TIMESTAMP on all of the listed files
289	291	**
290	292	** Options:
291		-**
292	293	** --mtime TIMESTAMP Use TIMESTAMP instead of "now" for the "add",
293	294	** "edit", "remove", and "touch" subcommands.
294	295	** -R\|--repository REPO Use FILE as the repository
295	296	*/
296	297	void unversioned_cmd(void){
297	298

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -250,12 +250,13 @@
250	** edit FILE Bring up FILE in a text editor for modification.
251	**
252	** export FILE OUTPUT Write the content of FILE into OUTPUT on disk
253	**
254	** list \| ls Show all unversioned files held in the local
255	** repository. Options:
256	**

257	** --glob PATTERN Show only files that match
258	** --like PATTERN Show only files that match
259	** -l Show additional details for
260	** files that match. Implied
261	** when 'list' is used.
	@@ -269,12 +270,13 @@
269	** -n\|--dry-run Show what would have happened
270	**
271	** remove\|rm\|delete FILE ...
272	** Remove unversioned files from the local repository.
273	** Changes are not pushed to other repositories until
274	** the next sync. Options:
275	**

276	** --glob PATTERN Remove files that match
277	** --like PATTERN Remove files that match
278	**
279	** sync ?URL? Synchronize the state of all unversioned files with
280	** the remote repository URL. The most recent version
	@@ -286,11 +288,10 @@
286	** -n\|--dry-run Show what would have happened
287	**
288	** touch FILE ... Update the TIMESTAMP on all of the listed files
289	**
290	** Options:
291	**
292	** --mtime TIMESTAMP Use TIMESTAMP instead of "now" for the "add",
293	** "edit", "remove", and "touch" subcommands.
294	** -R\|--repository REPO Use FILE as the repository
295	*/
296	void unversioned_cmd(void){
297

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -250,12 +250,13 @@
250	** edit FILE Bring up FILE in a text editor for modification.
251	**
252	** export FILE OUTPUT Write the content of FILE into OUTPUT on disk
253	**
254	** list \| ls Show all unversioned files held in the local
255	** repository.
256	**
257	** Options:
258	** --glob PATTERN Show only files that match
259	** --like PATTERN Show only files that match
260	** -l Show additional details for
261	** files that match. Implied
262	** when 'list' is used.
	@@ -269,12 +270,13 @@
270	** -n\|--dry-run Show what would have happened
271	**
272	** remove\|rm\|delete FILE ...
273	** Remove unversioned files from the local repository.
274	** Changes are not pushed to other repositories until
275	** the next sync.
276	**
277	** Options:
278	** --glob PATTERN Remove files that match
279	** --like PATTERN Remove files that match
280	**
281	** sync ?URL? Synchronize the state of all unversioned files with
282	** the remote repository URL. The most recent version
	@@ -286,11 +288,10 @@
288	** -n\|--dry-run Show what would have happened
289	**
290	** touch FILE ... Update the TIMESTAMP on all of the listed files
291	**
292	** Options:

293	** --mtime TIMESTAMP Use TIMESTAMP instead of "now" for the "add",
294	** "edit", "remove", and "touch" subcommands.
295	** -R\|--repository REPO Use FILE as the repository
296	*/
297	void unversioned_cmd(void){
298

M src/xfer.c

-1

		--- src/xfer.c
		+++ src/xfer.c
		@@ -1874,11 +1874,10 @@
1874	1874	** as necessary to generate an appropriate XFERFILE test case. Then run:
1875	1875	**
1876	1876	** fossil test-xfer xferfile.txt
1877	1877	**
1878	1878	** Options:
1879		-**
1880	1879	** --host HOSTNAME Supply a server hostname used to populate
1881	1880	** g.zBaseURL and similar.
1882	1881	*/
1883	1882	void cmd_test_xfer(void){
1884	1883	const char *zHost;
1885	1884

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1874,11 +1874,10 @@
1874	** as necessary to generate an appropriate XFERFILE test case. Then run:
1875	**
1876	** fossil test-xfer xferfile.txt
1877	**
1878	** Options:
1879	**
1880	** --host HOSTNAME Supply a server hostname used to populate
1881	** g.zBaseURL and similar.
1882	*/
1883	void cmd_test_xfer(void){
1884	const char *zHost;
1885

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1874,11 +1874,10 @@
1874	** as necessary to generate an appropriate XFERFILE test case. Then run:
1875	**
1876	** fossil test-xfer xferfile.txt
1877	**
1878	** Options:

1879	** --host HOSTNAME Supply a server hostname used to populate
1880	** g.zBaseURL and similar.
1881	*/
1882	void cmd_test_xfer(void){
1883	const char *zHost;
1884

Fossil SCM

Keyboard Shortcuts