Fossil SCM

More documentation tweaks and refinements.

drh 2013-07-19 19:40 trunk

Commit e94bef2dec75ae74267d7e93207d3ec89f4314a6

Parent 47dd7f36f704f2c…

6 files changed +7 +4 -4 +4 -4 +5 -3 +49 -24 +2 -1

~ www/build.wiki ~ www/faq.tcl ~ www/faq.wiki ~ www/hints.wiki ~ www/quickstart.wiki ~ www/server.wiki

M www/build.wiki

		--- www/build.wiki
		+++ www/build.wiki
		@@ -122,10 +122,17 @@
122	122	you, or for some other reason you want to know how to build
123	123	Fossil manually, then refer to the
124	124	[./makefile.wiki \| Fossil Build Process] document which describes
125	125	in detail what the makefiles do behind the scenes.
126	126
	127	+<li><p>
	128	+ The fossil executable is self-contained and stand-alone and usually
	129	+ requires no special libraries or other software to be installed. However,
	130	+ the "--tk" option to the [/help/diff\|diff command] requires that Tcl/Tk
	131	+ be installed on the local machine. You can get Tcl/Tk from
	132	+ [http://www.activestate.com/activetcl\|ActiveState].
	133	+
127	134	<li><p>
128	135	To build on older Macs (circa 2002, MacOS 10.2) edit the Makefile
129	136	generated by configure to add the following lines:
130	137	<blockquote><pre>
131	138	TCC += -DSQLITE_WITHOUT_ZONEMALLOC
132	139

	--- www/build.wiki
	+++ www/build.wiki
	@@ -122,10 +122,17 @@
122	you, or for some other reason you want to know how to build
123	Fossil manually, then refer to the
124	[./makefile.wiki \| Fossil Build Process] document which describes
125	in detail what the makefiles do behind the scenes.
126







127	<li><p>
128	To build on older Macs (circa 2002, MacOS 10.2) edit the Makefile
129	generated by configure to add the following lines:
130	<blockquote><pre>
131	TCC += -DSQLITE_WITHOUT_ZONEMALLOC
132

	--- www/build.wiki
	+++ www/build.wiki
	@@ -122,10 +122,17 @@
122	you, or for some other reason you want to know how to build
123	Fossil manually, then refer to the
124	[./makefile.wiki \| Fossil Build Process] document which describes
125	in detail what the makefiles do behind the scenes.
126
127	<li><p>
128	The fossil executable is self-contained and stand-alone and usually
129	requires no special libraries or other software to be installed. However,
130	the "--tk" option to the [/help/diff\|diff command] requires that Tcl/Tk
131	be installed on the local machine. You can get Tcl/Tk from
132	[http://www.activestate.com/activetcl\|ActiveState].
133
134	<li><p>
135	To build on older Macs (circa 2002, MacOS 10.2) edit the Makefile
136	generated by configure to add the following lines:
137	<blockquote><pre>
138	TCC += -DSQLITE_WITHOUT_ZONEMALLOC
139

M www/faq.tcl

+4 -4

		--- www/faq.tcl
		+++ www/faq.tcl
		@@ -37,13 +37,11 @@
37	37	} {
38	38	There are lots of ways:
39	39
40	40	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
41	41	command, you can add the option "--branch <i>BRANCH-NAME</i>" to
42		- make the new check-in be the first check-in for a new branch. You can
43		- also add the "--bgcolor <i>COLOR</i>" option to give the branch a
44		- specific background color on timelines.
	42	+ make the new check-in be the first check-in for a new branch.
45	43
46	44	If you want to create a new branch whose initial content is the
47	45	same as an existing check-in, use this command:
48	46
49	47	<blockquote>
		@@ -70,11 +68,13 @@
70	68	} {
71	69	There are several ways:
72	70
73	71	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
74	72	command, you can add a tag to that check-in using the
75		- "--tag <i>TAGNAME</i>" command-line option.
	73	+ "--tag <i>TAGNAME</i>" command-line option. You can repeat the --tag
	74	+ option to give a check-in multiple tags. Tags need not be unique. So,
	75	+ for example, it is common to give every released version a "release" tag.
76	76
77	77	If you want add a tag to an existing check-in, you can use the
78	78	<b>[/help/tag\|tag]</b> command. For example:
79	79
80	80	<blockquote>
81	81

	--- www/faq.tcl
	+++ www/faq.tcl
	@@ -37,13 +37,11 @@
37	} {
38	There are lots of ways:
39
40	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
41	command, you can add the option "--branch <i>BRANCH-NAME</i>" to
42	make the new check-in be the first check-in for a new branch. You can
43	also add the "--bgcolor <i>COLOR</i>" option to give the branch a
44	specific background color on timelines.
45
46	If you want to create a new branch whose initial content is the
47	same as an existing check-in, use this command:
48
49	<blockquote>
	@@ -70,11 +68,13 @@
70	} {
71	There are several ways:
72
73	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
74	command, you can add a tag to that check-in using the
75	"--tag <i>TAGNAME</i>" command-line option.


76
77	If you want add a tag to an existing check-in, you can use the
78	<b>[/help/tag\|tag]</b> command. For example:
79
80	<blockquote>
81

	--- www/faq.tcl
	+++ www/faq.tcl
	@@ -37,13 +37,11 @@
37	} {
38	There are lots of ways:
39
40	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
41	command, you can add the option "--branch <i>BRANCH-NAME</i>" to
42	make the new check-in be the first check-in for a new branch.


43
44	If you want to create a new branch whose initial content is the
45	same as an existing check-in, use this command:
46
47	<blockquote>
	@@ -70,11 +68,13 @@
68	} {
69	There are several ways:
70
71	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
72	command, you can add a tag to that check-in using the
73	"--tag <i>TAGNAME</i>" command-line option. You can repeat the --tag
74	option to give a check-in multiple tags. Tags need not be unique. So,
75	for example, it is common to give every released version a "release" tag.
76
77	If you want add a tag to an existing check-in, you can use the
78	<b>[/help/tag\|tag]</b> command. For example:
79
80	<blockquote>
81

M www/faq.wiki

+4 -4

		--- www/faq.wiki
		+++ www/faq.wiki
		@@ -41,13 +41,11 @@
41	41
42	42	<blockquote>There are lots of ways:
43	43
44	44	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
45	45	command, you can add the option "--branch <i>BRANCH-NAME</i>" to
46		-make the new check-in be the first check-in for a new branch. You can
47		-also add the "--bgcolor <i>COLOR</i>" option to give the branch a
48		-specific background color on timelines.
	46	+make the new check-in be the first check-in for a new branch.
49	47
50	48	If you want to create a new branch whose initial content is the
51	49	same as an existing check-in, use this command:
52	50
53	51	<blockquote>
		@@ -73,11 +71,13 @@
73	71
74	72	<blockquote>There are several ways:
75	73
76	74	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
77	75	command, you can add a tag to that check-in using the
78		-"--tag <i>TAGNAME</i>" command-line option.
	76	+"--tag <i>TAGNAME</i>" command-line option. You can repeat the --tag
	77	+option to give a check-in multiple tags. Tags need not be unique. So,
	78	+for example, it is common to give every released version a "release" tag.
79	79
80	80	If you want add a tag to an existing check-in, you can use the
81	81	<b>[/help/tag\|tag]</b> command. For example:
82	82
83	83	<blockquote>
84	84

	--- www/faq.wiki
	+++ www/faq.wiki
	@@ -41,13 +41,11 @@
41
42	<blockquote>There are lots of ways:
43
44	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
45	command, you can add the option "--branch <i>BRANCH-NAME</i>" to
46	make the new check-in be the first check-in for a new branch. You can
47	also add the "--bgcolor <i>COLOR</i>" option to give the branch a
48	specific background color on timelines.
49
50	If you want to create a new branch whose initial content is the
51	same as an existing check-in, use this command:
52
53	<blockquote>
	@@ -73,11 +71,13 @@
73
74	<blockquote>There are several ways:
75
76	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
77	command, you can add a tag to that check-in using the
78	"--tag <i>TAGNAME</i>" command-line option.


79
80	If you want add a tag to an existing check-in, you can use the
81	<b>[/help/tag\|tag]</b> command. For example:
82
83	<blockquote>
84

	--- www/faq.wiki
	+++ www/faq.wiki
	@@ -41,13 +41,11 @@
41
42	<blockquote>There are lots of ways:
43
44	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
45	command, you can add the option "--branch <i>BRANCH-NAME</i>" to
46	make the new check-in be the first check-in for a new branch.


47
48	If you want to create a new branch whose initial content is the
49	same as an existing check-in, use this command:
50
51	<blockquote>
	@@ -73,11 +71,13 @@
71
72	<blockquote>There are several ways:
73
74	When you are checking in a new change using the <b>[/help/commit\|commit]</b>
75	command, you can add a tag to that check-in using the
76	"--tag <i>TAGNAME</i>" command-line option. You can repeat the --tag
77	option to give a check-in multiple tags. Tags need not be unique. So,
78	for example, it is common to give every released version a "release" tag.
79
80	If you want add a tag to an existing check-in, you can use the
81	<b>[/help/tag\|tag]</b> command. For example:
82
83	<blockquote>
84

M www/hints.wiki

+5 -3

		--- www/hints.wiki
		+++ www/hints.wiki
		@@ -1,8 +1,8 @@
1	1	<title>Fossil Tips And Usage Hints</title>
2	2
3		- 1. Click on nodes of any timeline graph to see diffs between two
	3	+ 1. Click on nodes of any timeline graph to see diffs between the two
4	4	selected versions.
5	5
6	6	2. Add the "--tk" option to "[/help?cmd=diff \| fossil diff]" commands
7	7	to get a pop-up
8	8	window containing a complete side-by-side diff. (NB: The pop-up
		@@ -14,13 +14,15 @@
14	14	3. The "[/help?cmd=clean \| fossil clean -f]" command makes a great
15	15	alternative to "make clean".
16	16
17	17	4. Use "[/help?cmd=all \| fossil all changes]" to look for any uncommitted
18	18	edits in any of your Fossil projects. Use
19		- "[/help?cmd=all \| fossil all sync]" on your laptop
	19	+ "[/help?cmd=all \| fossil all pull]" on your laptop
20	20	prior to going off network (for example, on a long plane ride)
21		- to make sure you have all of content local.
	21	+ to make sure you have all the latest content locally. Then run
	22	+ "[/help/all\|fossil all push]" when you get back online to upload
	23	+ your changes.
22	24
23	25	5. Sub-menu options on Timelines lets you select either 20 or 200
24	26	records. But you can manual edit the "n=" query parameter in the
25	27	URL to get any number of records you desire. To see a complete
26	28	timeline graph, set n to some ridiculously large value like 10000000.
27	29

	--- www/hints.wiki
	+++ www/hints.wiki
	@@ -1,8 +1,8 @@
1	<title>Fossil Tips And Usage Hints</title>
2
3	1. Click on nodes of any timeline graph to see diffs between two
4	selected versions.
5
6	2. Add the "--tk" option to "[/help?cmd=diff \| fossil diff]" commands
7	to get a pop-up
8	window containing a complete side-by-side diff. (NB: The pop-up
	@@ -14,13 +14,15 @@
14	3. The "[/help?cmd=clean \| fossil clean -f]" command makes a great
15	alternative to "make clean".
16
17	4. Use "[/help?cmd=all \| fossil all changes]" to look for any uncommitted
18	edits in any of your Fossil projects. Use
19	"[/help?cmd=all \| fossil all sync]" on your laptop
20	prior to going off network (for example, on a long plane ride)
21	to make sure you have all of content local.


22
23	5. Sub-menu options on Timelines lets you select either 20 or 200
24	records. But you can manual edit the "n=" query parameter in the
25	URL to get any number of records you desire. To see a complete
26	timeline graph, set n to some ridiculously large value like 10000000.
27

	--- www/hints.wiki
	+++ www/hints.wiki
	@@ -1,8 +1,8 @@
1	<title>Fossil Tips And Usage Hints</title>
2
3	1. Click on nodes of any timeline graph to see diffs between the two
4	selected versions.
5
6	2. Add the "--tk" option to "[/help?cmd=diff \| fossil diff]" commands
7	to get a pop-up
8	window containing a complete side-by-side diff. (NB: The pop-up
	@@ -14,13 +14,15 @@
14	3. The "[/help?cmd=clean \| fossil clean -f]" command makes a great
15	alternative to "make clean".
16
17	4. Use "[/help?cmd=all \| fossil all changes]" to look for any uncommitted
18	edits in any of your Fossil projects. Use
19	"[/help?cmd=all \| fossil all pull]" on your laptop
20	prior to going off network (for example, on a long plane ride)
21	to make sure you have all the latest content locally. Then run
22	"[/help/all\|fossil all push]" when you get back online to upload
23	your changes.
24
25	5. Sub-menu options on Timelines lets you select either 20 or 200
26	records. But you can manual edit the "n=" query parameter in the
27	URL to get any number of records you desire. To see a complete
28	timeline graph, set n to some ridiculously large value like 10000000.
29

M www/quickstart.wiki

+49 -24

		--- www/quickstart.wiki
		+++ www/quickstart.wiki
		@@ -173,13 +173,21 @@
173	173	</blockquote>
174	174
175	175	<p>You will be prompted for check-in comments using whatever editor
176	176	is specified by your VISUAL or EDITOR environment variable.</p>
177	177
	178	+ In the default configuration, the [/help/commit\|commit]
	179	+ command will also automatically [/help/push\|push] your changes, but that
	180	+ feature can be disabled. (More information about
	181	+ [./concepts.wiki#workflow\|autosync] and how to disable it.)
	182	+ Remember that your coworkers can not see your changes until you
	183	+ commit and push them.</p>
	184	+
178	185	<h2>Sharing Changes</h2>
179	186
180		- <p>The changes you [/help/commit \| commit] are only
	187	+ <p>When [./concepts.wiki#workflow\|autosync] is turned off,
	188	+ the changes you [/help/commit \| commit] are only
181	189	on your local repository.
182	190	To share those changes with other repositories, do:</p>
183	191
184	192	<blockquote>
185	193	<b>[/help/push \| fossil push]</b> <i>URL</i>
		@@ -212,10 +220,17 @@
212	220	date/time stamp. ([./checkin_names.wiki \| more info])
213	221	If you omit
214	222	the <i>VERSION</i>, then fossil moves you to the
215	223	latest version of the branch your are currently on.</p>
216	224
	225	+ <p>The default behaviors is for [./concepts.wiki#workflow\|autosync] to
	226	+ be turned on. That means that a [/help/pull\|pull] automatically occurs
	227	+ when you run [/help/update\|update] and a [/help/push\|push] happens
	228	+ automatically after you [/help/commit\|commit]. So in normal practice,
	229	+ the push, pull, and sync commands are rarely used. But it is important
	230	+ to know about them, all the same.</p>
	231	+
217	232	<h2>Branching And Merging</h2>
218	233
219	234	<p>Use the --branch option to the [/help/commit \| commit] command
220	235	to start a new branch. Note that in Fossil, branches are normally
221	236	created when you commit, not before you start editing. You can
		@@ -222,36 +237,43 @@
222	237	use the [/help/branch \| branch new] command to create a new branch
223	238	before you start editing, if you want, but most people just wait
224	239	until they are ready to commit.
225	240
226	241	To merge two branches back together, first
227		- [/help/update \| update] to the leaf of one branch. Then do a
228		- [/help/merge \| merge] of the leaf of the other branch:</p>
	242	+ [/help/update \| update] to the branch you want to merge into.
	243	+ Then do a [/help/merge\|merge] another branch that you want to incorporate
	244	+ the changes from. For example, to merge "featureX" changes into "trunk"
	245	+ do this:</p>
229	246
230	247	<blockquote>
231		- <b>[/help/merge \| fossil merge]</b> <i>VERSION</i>
	248	+ <b>fossil [/help/update\|update] trunk</b><br>
	249	+ <b>fossil [/help/merge\|merge] featureX</b><br>
	250	+ <i># make sure the merge didn't break anything...</i><br>
	251	+ <b>fossil [/help/commit\|commit]
232	252	</blockquote>
233	253
234		- <p>The <i>VERSION</i> can be any of the forms allowed for
235		- [/help/update \| update].
236		- After performing the merge, you will normally want to test it to
237		- make sure it does not break anything, then
238		- [/help/commit \| commit] your changes.
239		- In the default configuration, the [/help/commit\|commit]
240		- command will also automatically [/help/push\|push] your changes, but that
241		- feature can be disabled. (More information about
242		- [./concepts.wiki#workflow\|autosync] and how to disable it.)
243		- Remember that your coworkers can not see your changes until you
244		- commit and push them.</p>
245		-
246		- <p>The merge command has options to cherrypick individual
247		- changes, or to back out individual changes.</p>
248		-
249		- <p>Note that the merge command changes only your local check-out.
250		- The merge command does <em>not</em> modify the repository in any way.
251		- You must do a separate [/help/commit \| commit] after the merge in order
252		- to put the merged code back into the repository.</p>
	254	+ <p>The argument to the [/help/merge\|merge] command can be any of the
	255	+ version identifier forms that work for [/help/update\|update].
	256	+ ([./checkin_names.wiki\|more info].)
	257	+ The merge command has options to cherrypick individual
	258	+ changes, or to back out individual changes, if you don't want to
	259	+ do a full merge.</p>
	260	+
	261	+ The merge command puts all changes in your working check-out.
	262	+ No changes are made to the repository.
	263	+ You must run [/help/commit\|commit] separately
	264	+ to add the merge changes into your repository to make them persistent
	265	+ and so that your coworkers can see them.
	266	+ But before you do that, you will normally want to run a few tests
	267	+ to verify that the merge didn't cause logic breaks in your code.
	268	+
	269	+ The same branch can be merged multiple times without trouble. Fossil
	270	+ automatically keeps up with things and avoids conflicts when doing
	271	+ multiple merges. So even if you have merged the featureX branch
	272	+ into trunk previously, you can do so again and Fossil will automatically
	273	+ know to pull in only those changes that have occurred since the previous
	274	+ merge.
253	275
254	276	<p>If a merge or update doesn't work out (perhaps something breaks or
255	277	there are many merge conflicts) then you back up using:</p>
256	278
257	279	<blockquote>
		@@ -369,8 +391,11 @@
369	391	<b>fossil sync http://192.168.1.36:8080/ --proxy off</b>
370	392	</blockquote>
371	393
372	394	<h2>More Hints</h2>
373	395
374		- <p>A [/help \| complete list of commands] is available.
	396	+ <p>A [/help \| complete list of commands] is available, as is the
	397	+ [./hints.wiki\|helpful hints] document. See the
	398	+ [./permutedindex.wiki#pindex\|permuted index] for additional
	399	+ documentation.
375	400
376	401	<p>Explore and have fun!</p>
377	402

	--- www/quickstart.wiki
	+++ www/quickstart.wiki
	@@ -173,13 +173,21 @@
173	</blockquote>
174
175	<p>You will be prompted for check-in comments using whatever editor
176	is specified by your VISUAL or EDITOR environment variable.</p>
177







178	<h2>Sharing Changes</h2>
179
180	<p>The changes you [/help/commit \| commit] are only

181	on your local repository.
182	To share those changes with other repositories, do:</p>
183
184	<blockquote>
185	<b>[/help/push \| fossil push]</b> <i>URL</i>
	@@ -212,10 +220,17 @@
212	date/time stamp. ([./checkin_names.wiki \| more info])
213	If you omit
214	the <i>VERSION</i>, then fossil moves you to the
215	latest version of the branch your are currently on.</p>
216







217	<h2>Branching And Merging</h2>
218
219	<p>Use the --branch option to the [/help/commit \| commit] command
220	to start a new branch. Note that in Fossil, branches are normally
221	created when you commit, not before you start editing. You can
	@@ -222,36 +237,43 @@
222	use the [/help/branch \| branch new] command to create a new branch
223	before you start editing, if you want, but most people just wait
224	until they are ready to commit.
225
226	To merge two branches back together, first
227	[/help/update \| update] to the leaf of one branch. Then do a
228	[/help/merge \| merge] of the leaf of the other branch:</p>


229
230	<blockquote>
231	<b>[/help/merge \| fossil merge]</b> <i>VERSION</i>



232	</blockquote>
233
234	<p>The <i>VERSION</i> can be any of the forms allowed for
235	[/help/update \| update].
236	After performing the merge, you will normally want to test it to
237	make sure it does not break anything, then
238	[/help/commit \| commit] your changes.
239	In the default configuration, the [/help/commit\|commit]
240	command will also automatically [/help/push\|push] your changes, but that
241	feature can be disabled. (More information about
242	[./concepts.wiki#workflow\|autosync] and how to disable it.)
243	Remember that your coworkers can not see your changes until you
244	commit and push them.</p>
245
246	<p>The merge command has options to cherrypick individual
247	changes, or to back out individual changes.</p>
248
249	<p>Note that the merge command changes only your local check-out.
250	The merge command does <em>not</em> modify the repository in any way.
251	You must do a separate [/help/commit \| commit] after the merge in order
252	to put the merged code back into the repository.</p>


253
254	<p>If a merge or update doesn't work out (perhaps something breaks or
255	there are many merge conflicts) then you back up using:</p>
256
257	<blockquote>
	@@ -369,8 +391,11 @@
369	<b>fossil sync http://192.168.1.36:8080/ --proxy off</b>
370	</blockquote>
371
372	<h2>More Hints</h2>
373
374	<p>A [/help \| complete list of commands] is available.



375
376	<p>Explore and have fun!</p>
377

	--- www/quickstart.wiki
	+++ www/quickstart.wiki
	@@ -173,13 +173,21 @@
173	</blockquote>
174
175	<p>You will be prompted for check-in comments using whatever editor
176	is specified by your VISUAL or EDITOR environment variable.</p>
177
178	In the default configuration, the [/help/commit\|commit]
179	command will also automatically [/help/push\|push] your changes, but that
180	feature can be disabled. (More information about
181	[./concepts.wiki#workflow\|autosync] and how to disable it.)
182	Remember that your coworkers can not see your changes until you
183	commit and push them.</p>
184
185	<h2>Sharing Changes</h2>
186
187	<p>When [./concepts.wiki#workflow\|autosync] is turned off,
188	the changes you [/help/commit \| commit] are only
189	on your local repository.
190	To share those changes with other repositories, do:</p>
191
192	<blockquote>
193	<b>[/help/push \| fossil push]</b> <i>URL</i>
	@@ -212,10 +220,17 @@
220	date/time stamp. ([./checkin_names.wiki \| more info])
221	If you omit
222	the <i>VERSION</i>, then fossil moves you to the
223	latest version of the branch your are currently on.</p>
224
225	<p>The default behaviors is for [./concepts.wiki#workflow\|autosync] to
226	be turned on. That means that a [/help/pull\|pull] automatically occurs
227	when you run [/help/update\|update] and a [/help/push\|push] happens
228	automatically after you [/help/commit\|commit]. So in normal practice,
229	the push, pull, and sync commands are rarely used. But it is important
230	to know about them, all the same.</p>
231
232	<h2>Branching And Merging</h2>
233
234	<p>Use the --branch option to the [/help/commit \| commit] command
235	to start a new branch. Note that in Fossil, branches are normally
236	created when you commit, not before you start editing. You can
	@@ -222,36 +237,43 @@
237	use the [/help/branch \| branch new] command to create a new branch
238	before you start editing, if you want, but most people just wait
239	until they are ready to commit.
240
241	To merge two branches back together, first
242	[/help/update \| update] to the branch you want to merge into.
243	Then do a [/help/merge\|merge] another branch that you want to incorporate
244	the changes from. For example, to merge "featureX" changes into "trunk"
245	do this:</p>
246
247	<blockquote>
248	<b>fossil [/help/update\|update] trunk</b><br>
249	<b>fossil [/help/merge\|merge] featureX</b><br>
250	<i># make sure the merge didn't break anything...</i><br>
251	<b>fossil [/help/commit\|commit]
252	</blockquote>
253
254	<p>The argument to the [/help/merge\|merge] command can be any of the
255	version identifier forms that work for [/help/update\|update].
256	([./checkin_names.wiki\|more info].)
257	The merge command has options to cherrypick individual
258	changes, or to back out individual changes, if you don't want to
259	do a full merge.</p>
260
261	The merge command puts all changes in your working check-out.
262	No changes are made to the repository.
263	You must run [/help/commit\|commit] separately
264	to add the merge changes into your repository to make them persistent
265	and so that your coworkers can see them.
266	But before you do that, you will normally want to run a few tests
267	to verify that the merge didn't cause logic breaks in your code.
268
269	The same branch can be merged multiple times without trouble. Fossil
270	automatically keeps up with things and avoids conflicts when doing
271	multiple merges. So even if you have merged the featureX branch
272	into trunk previously, you can do so again and Fossil will automatically
273	know to pull in only those changes that have occurred since the previous
274	merge.
275
276	<p>If a merge or update doesn't work out (perhaps something breaks or
277	there are many merge conflicts) then you back up using:</p>
278
279	<blockquote>
	@@ -369,8 +391,11 @@
391	<b>fossil sync http://192.168.1.36:8080/ --proxy off</b>
392	</blockquote>
393
394	<h2>More Hints</h2>
395
396	<p>A [/help \| complete list of commands] is available, as is the
397	[./hints.wiki\|helpful hints] document. See the
398	[./permutedindex.wiki#pindex\|permuted index] for additional
399	documentation.
400
401	<p>Explore and have fun!</p>
402

M www/server.wiki

+2 -1

		--- www/server.wiki
		+++ www/server.wiki
		@@ -107,11 +107,12 @@
107	107	<h2>Various security concerns with hosted repositories</h2><blockquote>
108	108	<p>
109	109	There are two main concerns relating to usage of Fossil for sharing sensitive information (source or any other data):
110	110	<ul>
111	111	<li>Interception of the Fossil synchronization stream, thereby capturing data, and
112		-</ul>Direct access to the Fossil repository on the server
	112	+<li>Direct access to the Fossil repository on the server
	113	+</ul>
113	114	</p>
114	115	<p>
115	116	Regarding the first, it is adequate to secure the server using SSL, and disallowing any non-SSL access. The data stream will be encrypted by the HTTPS protocol, rendering the data reasonably secure. The truly paranoid may wish to deploy <i>ssh</i> encrypted tunnels, but that is quite a bit more difficult and cumbersome to set up (particularly for a larger number of users).
116	117	</p>
117	118	<p>
118	119

	--- www/server.wiki
	+++ www/server.wiki
	@@ -107,11 +107,12 @@
107	<h2>Various security concerns with hosted repositories</h2><blockquote>
108	<p>
109	There are two main concerns relating to usage of Fossil for sharing sensitive information (source or any other data):
110	<ul>
111	<li>Interception of the Fossil synchronization stream, thereby capturing data, and
112	</ul>Direct access to the Fossil repository on the server

113	</p>
114	<p>
115	Regarding the first, it is adequate to secure the server using SSL, and disallowing any non-SSL access. The data stream will be encrypted by the HTTPS protocol, rendering the data reasonably secure. The truly paranoid may wish to deploy <i>ssh</i> encrypted tunnels, but that is quite a bit more difficult and cumbersome to set up (particularly for a larger number of users).
116	</p>
117	<p>
118

	--- www/server.wiki
	+++ www/server.wiki
	@@ -107,11 +107,12 @@
107	<h2>Various security concerns with hosted repositories</h2><blockquote>
108	<p>
109	There are two main concerns relating to usage of Fossil for sharing sensitive information (source or any other data):
110	<ul>
111	<li>Interception of the Fossil synchronization stream, thereby capturing data, and
112	<li>Direct access to the Fossil repository on the server
113	</ul>
114	</p>
115	<p>
116	Regarding the first, it is adequate to secure the server using SSL, and disallowing any non-SSL access. The data stream will be encrypted by the HTTPS protocol, rendering the data reasonably secure. The truly paranoid may wish to deploy <i>ssh</i> encrypted tunnels, but that is quite a bit more difficult and cumbersome to set up (particularly for a larger number of users).
117	</p>
118	<p>
119

Fossil SCM

Keyboard Shortcuts