81da2ee39f4… — Fossil SCM

M src/sync.c

+5 -5

		--- src/sync.c
		+++ src/sync.c
		@@ -132,19 +132,19 @@
132	132	** Pull changes from a remote repository into the local repository.
133	133	** Use the "-R REPO" or "--repository REPO" command-line options
134	134	** to specify an alternative repository file.
135	135	**
136	136	** If the URL is not specified, then the URL from the most recent
137		-** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command
	137	+** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
138	138	** is used.
139	139	**
140	140	** The URL specified normally becomes the new "remote-url" used for
141	141	** subsequent push, pull, and sync operations. However, the "--once"
142	142	** command-line option makes the URL a one-time-use URL that is not
143	143	** saved.
144	144	**
145		-** See also: <a>clone</a>, <a>push</a>, <A>sync</a>, <a>remote-url</a>
	145	+** See also: <a>clone</a>, <a>push</a>, <a>sync</a>, <a>remote-url</a>
146	146	*/
147	147	void pull_cmd(void){
148	148	int syncFlags = process_sync_args();
149	149	client_sync(0,1,0,syncFlags,0);
150	150	}
		@@ -157,11 +157,11 @@
157	157	** Push changes in the local repository over into a remote repository.
158	158	** Use the "-R REPO" or "--repository REPO" command-line options
159	159	** to specify an alternative repository file.
160	160	**
161	161	** If the URL is not specified, then the URL from the most recent
162		-** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
	162	+** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
163	163	** is used.
164	164	**
165	165	** The URL specified normally becomes the new "remote-url" used for
166	166	** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
167	167	** the "--once" command-line option makes the URL a one-time-use URL
		@@ -188,12 +188,12 @@
188	188	** If a user-id and password are required, specify them as follows:
189	189	**
190	190	** http://userid:[email protected]:1234/path
191	191	**
192	192	** If the URL is not specified, then the URL from the most recent
193		-** successful <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command
194		-** is used.
	193	+** successful <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or <a>sync</a>
	194	+** command is used.
195	195	**
196	196	** The URL specified normally becomes the new "remote-url" used for
197	197	** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
198	198	** the "--once" command-line option makes the URL a one-time-use URL
199	199	** that is not saved.
200	200

	--- src/sync.c
	+++ src/sync.c
	@@ -132,19 +132,19 @@
132	** Pull changes from a remote repository into the local repository.
133	** Use the "-R REPO" or "--repository REPO" command-line options
134	** to specify an alternative repository file.
135	**
136	** If the URL is not specified, then the URL from the most recent
137	** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command
138	** is used.
139	**
140	** The URL specified normally becomes the new "remote-url" used for
141	** subsequent push, pull, and sync operations. However, the "--once"
142	** command-line option makes the URL a one-time-use URL that is not
143	** saved.
144	**
145	** See also: <a>clone</a>, <a>push</a>, <A>sync</a>, <a>remote-url</a>
146	*/
147	void pull_cmd(void){
148	int syncFlags = process_sync_args();
149	client_sync(0,1,0,syncFlags,0);
150	}
	@@ -157,11 +157,11 @@
157	** Push changes in the local repository over into a remote repository.
158	** Use the "-R REPO" or "--repository REPO" command-line options
159	** to specify an alternative repository file.
160	**
161	** If the URL is not specified, then the URL from the most recent
162	** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
163	** is used.
164	**
165	** The URL specified normally becomes the new "remote-url" used for
166	** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
167	** the "--once" command-line option makes the URL a one-time-use URL
	@@ -188,12 +188,12 @@
188	** If a user-id and password are required, specify them as follows:
189	**
190	** http://userid:[email protected]:1234/path
191	**
192	** If the URL is not specified, then the URL from the most recent
193	** successful <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command
194	** is used.
195	**
196	** The URL specified normally becomes the new "remote-url" used for
197	** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
198	** the "--once" command-line option makes the URL a one-time-use URL
199	** that is not saved.
200

	--- src/sync.c
	+++ src/sync.c
	@@ -132,19 +132,19 @@
132	** Pull changes from a remote repository into the local repository.
133	** Use the "-R REPO" or "--repository REPO" command-line options
134	** to specify an alternative repository file.
135	**
136	** If the URL is not specified, then the URL from the most recent
137	** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
138	** is used.
139	**
140	** The URL specified normally becomes the new "remote-url" used for
141	** subsequent push, pull, and sync operations. However, the "--once"
142	** command-line option makes the URL a one-time-use URL that is not
143	** saved.
144	**
145	** See also: <a>clone</a>, <a>push</a>, <a>sync</a>, <a>remote-url</a>
146	*/
147	void pull_cmd(void){
148	int syncFlags = process_sync_args();
149	client_sync(0,1,0,syncFlags,0);
150	}
	@@ -157,11 +157,11 @@
157	** Push changes in the local repository over into a remote repository.
158	** Use the "-R REPO" or "--repository REPO" command-line options
159	** to specify an alternative repository file.
160	**
161	** If the URL is not specified, then the URL from the most recent
162	** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
163	** is used.
164	**
165	** The URL specified normally becomes the new "remote-url" used for
166	** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
167	** the "--once" command-line option makes the URL a one-time-use URL
	@@ -188,12 +188,12 @@
188	** If a user-id and password are required, specify them as follows:
189	**
190	** http://userid:[email protected]:1234/path
191	**
192	** If the URL is not specified, then the URL from the most recent
193	** successful <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or <a>sync</a>
194	** command is used.
195	**
196	** The URL specified normally becomes the new "remote-url" used for
197	** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
198	** the "--once" command-line option makes the URL a one-time-use URL
199	** that is not saved.
200

M src/tag.c

+1 -1

		--- src/tag.c
		+++ src/tag.c
		@@ -318,11 +318,11 @@
318	318	**
319	319	** %fossil tag add ?--raw? ?--propagate? TAGNAME CHECK-IN ?VALUE?
320	320	**
321	321	** Add a new tag or property to CHECK-IN. The tag will
322	322	** be usable instead of a CHECK-IN in commands such as
323		-** update and merge. If the --propagate flag is present,
	323	+** <a>update</a> and <a>merge</a>. If the --propagate flag is present,
324	324	** the tag value propages to all descendants of CHECK-IN
325	325	**
326	326	** %fossil tag cancel ?--raw? TAGNAME CHECK-IN
327	327	**
328	328	** Remove the tag TAGNAME from CHECK-IN, and also remove
329	329

	--- src/tag.c
	+++ src/tag.c
	@@ -318,11 +318,11 @@
318	**
319	** %fossil tag add ?--raw? ?--propagate? TAGNAME CHECK-IN ?VALUE?
320	**
321	** Add a new tag or property to CHECK-IN. The tag will
322	** be usable instead of a CHECK-IN in commands such as
323	** update and merge. If the --propagate flag is present,
324	** the tag value propages to all descendants of CHECK-IN
325	**
326	** %fossil tag cancel ?--raw? TAGNAME CHECK-IN
327	**
328	** Remove the tag TAGNAME from CHECK-IN, and also remove
329

	--- src/tag.c
	+++ src/tag.c
	@@ -318,11 +318,11 @@
318	**
319	** %fossil tag add ?--raw? ?--propagate? TAGNAME CHECK-IN ?VALUE?
320	**
321	** Add a new tag or property to CHECK-IN. The tag will
322	** be usable instead of a CHECK-IN in commands such as
323	** <a>update</a> and <a>merge</a>. If the --propagate flag is present,
324	** the tag value propages to all descendants of CHECK-IN
325	**
326	** %fossil tag cancel ?--raw? TAGNAME CHECK-IN
327	**
328	** Remove the tag TAGNAME from CHECK-IN, and also remove
329

M src/timeline.c

+1

		--- src/timeline.c
		+++ src/timeline.c
		@@ -1091,10 +1091,11 @@
1091	1091	** page. For example:
1092	1092	**
1093	1093	** w = wiki commits only
1094	1094	** ci = file commits only
1095	1095	** t = tickets only
	1096	+** e = events only
1096	1097	*/
1097	1098	void timeline_cmd(void){
1098	1099	Stmt q;
1099	1100	int n, k;
1100	1101	const char *zCount;
1101	1102

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1091,10 +1091,11 @@
1091	** page. For example:
1092	**
1093	** w = wiki commits only
1094	** ci = file commits only
1095	** t = tickets only

1096	*/
1097	void timeline_cmd(void){
1098	Stmt q;
1099	int n, k;
1100	const char *zCount;
1101

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1091,10 +1091,11 @@
1091	** page. For example:
1092	**
1093	** w = wiki commits only
1094	** ci = file commits only
1095	** t = tickets only
1096	** e = events only
1097	*/
1098	void timeline_cmd(void){
1099	Stmt q;
1100	int n, k;
1101	const char *zCount;
1102

M src/undo.c

+4 -4

		--- src/undo.c
		+++ src/undo.c
		@@ -249,12 +249,12 @@
249	249	** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a> operation.
250	250	** If FILENAME is specified then restore the content of the named
251	251	** file(s) but otherwise leave the <a>update</a>, <a>merge</a> or <a>revert</a>
252	252	** in effect.
253	253	**
254		-** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a>
255		-** stack is cleared by the commit and checkout commands.
	254	+** A single level of <a>undo</a>/<a>redo</a> is supported. The undo/<a>redo</a>
	255	+** stack is cleared by the <a>commit</a> and <a>checkout</a> commands.
256	256	*/
257	257	void undo_cmd(void){
258	258	int undo_available;
259	259	db_must_be_within_tree();
260	260	db_begin_transaction();
		@@ -289,12 +289,12 @@
289	289	** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been
290	290	** undone by the <a>undo</a> command. If FILENAME is specified then restore
291	291	** the changes associated with the named file(s) but otherwise leave the
292	292	** update or merge undone.
293	293	**
294		-** A single level of <a>undo</a>/redo is supported. The <a>undo</a>/redo stack
295		-** is cleared by the <a>commit</a> and <a>checkout</a> commands.
	294	+** A single level of <a>undo</a>/<a>redo</a> is supported. The <a>undo</a>/<a>redo</a>
	295	+** stack is cleared by the <a>commit</a> and <a>checkout</a> commands.
296	296	*/
297	297	void redo_cmd(void){
298	298	int undo_available;
299	299	db_must_be_within_tree();
300	300	db_begin_transaction();
301	301

	--- src/undo.c
	+++ src/undo.c
	@@ -249,12 +249,12 @@
249	** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a> operation.
250	** If FILENAME is specified then restore the content of the named
251	** file(s) but otherwise leave the <a>update</a>, <a>merge</a> or <a>revert</a>
252	** in effect.
253	**
254	** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a>
255	** stack is cleared by the commit and checkout commands.
256	*/
257	void undo_cmd(void){
258	int undo_available;
259	db_must_be_within_tree();
260	db_begin_transaction();
	@@ -289,12 +289,12 @@
289	** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been
290	** undone by the <a>undo</a> command. If FILENAME is specified then restore
291	** the changes associated with the named file(s) but otherwise leave the
292	** update or merge undone.
293	**
294	** A single level of <a>undo</a>/redo is supported. The <a>undo</a>/redo stack
295	** is cleared by the <a>commit</a> and <a>checkout</a> commands.
296	*/
297	void redo_cmd(void){
298	int undo_available;
299	db_must_be_within_tree();
300	db_begin_transaction();
301

	--- src/undo.c
	+++ src/undo.c
	@@ -249,12 +249,12 @@
249	** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a> operation.
250	** If FILENAME is specified then restore the content of the named
251	** file(s) but otherwise leave the <a>update</a>, <a>merge</a> or <a>revert</a>
252	** in effect.
253	**
254	** A single level of <a>undo</a>/<a>redo</a> is supported. The undo/<a>redo</a>
255	** stack is cleared by the <a>commit</a> and <a>checkout</a> commands.
256	*/
257	void undo_cmd(void){
258	int undo_available;
259	db_must_be_within_tree();
260	db_begin_transaction();
	@@ -289,12 +289,12 @@
289	** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been
290	** undone by the <a>undo</a> command. If FILENAME is specified then restore
291	** the changes associated with the named file(s) but otherwise leave the
292	** update or merge undone.
293	**
294	** A single level of <a>undo</a>/<a>redo</a> is supported. The <a>undo</a>/<a>redo</a>
295	** stack is cleared by the <a>commit</a> and <a>checkout</a> commands.
296	*/
297	void redo_cmd(void){
298	int undo_available;
299	db_must_be_within_tree();
300	db_begin_transaction();
301

Fossil SCM

Keyboard Shortcuts