4d21ec88ea1… — Fossil SCM

M www/gitusers.md

+2 -2

		--- www/gitusers.md
		+++ www/gitusers.md
		@@ -951,11 +951,11 @@
951	951	We believe you get such answers to Git help requests in part
952	952	because of its lack of an always-up-to-date [index into its log](#log) and in
953	953	part because of its “small tools loosely joined” design philosophy. This
954	954	sort of command is therefore composed piece by piece:
955	955
956		-<center>◆ ◆ ◆</center>
	956	+<p style="text-align:center">◆ ◆ ◆</p>
957	957
958	958	“Oh, I know, I’ll search the rev-list, which outputs commit IDs by
959	959	parsing the log backwards from `HEAD`! Easy!”
960	960
961	961	git rev-list --before=2020-03-17
		@@ -985,11 +985,11 @@
985	985
986	986	git checkout $(git rev-list -n 1 --first-parent --before=2020-03-17 master)
987	987
988	988	“Success, I guess?”
989	989
990		-<center>◆ ◆ ◆</center>
	990	+<p style="text-align:center">◆ ◆ ◆</p>
991	991
992	992	This vignette is meant to explain some of Git’s popularity: it rewards
993	993	the sort of people who enjoy puzzles, many of whom are software
994	994	developers and thus need a tool like Git. Too bad if you’re just a
995	995	normal user.
996	996

	--- www/gitusers.md
	+++ www/gitusers.md
	@@ -951,11 +951,11 @@
951	We believe you get such answers to Git help requests in part
952	because of its lack of an always-up-to-date [index into its log](#log) and in
953	part because of its “small tools loosely joined” design philosophy. This
954	sort of command is therefore composed piece by piece:
955
956	<center>◆ ◆ ◆</center>
957
958	“Oh, I know, I’ll search the rev-list, which outputs commit IDs by
959	parsing the log backwards from `HEAD`! Easy!”
960
961	git rev-list --before=2020-03-17
	@@ -985,11 +985,11 @@
985
986	git checkout $(git rev-list -n 1 --first-parent --before=2020-03-17 master)
987
988	“Success, I guess?”
989
990	<center>◆ ◆ ◆</center>
991
992	This vignette is meant to explain some of Git’s popularity: it rewards
993	the sort of people who enjoy puzzles, many of whom are software
994	developers and thus need a tool like Git. Too bad if you’re just a
995	normal user.
996

	--- www/gitusers.md
	+++ www/gitusers.md
	@@ -951,11 +951,11 @@
951	We believe you get such answers to Git help requests in part
952	because of its lack of an always-up-to-date [index into its log](#log) and in
953	part because of its “small tools loosely joined” design philosophy. This
954	sort of command is therefore composed piece by piece:
955
956	<p style="text-align:center">◆ ◆ ◆</p>
957
958	“Oh, I know, I’ll search the rev-list, which outputs commit IDs by
959	parsing the log backwards from `HEAD`! Easy!”
960
961	git rev-list --before=2020-03-17
	@@ -985,11 +985,11 @@
985
986	git checkout $(git rev-list -n 1 --first-parent --before=2020-03-17 master)
987
988	“Success, I guess?”
989
990	<p style="text-align:center">◆ ◆ ◆</p>
991
992	This vignette is meant to explain some of Git’s popularity: it rewards
993	the sort of people who enjoy puzzles, many of whom are software
994	developers and thus need a tool like Git. Too bad if you’re just a
995	normal user.
996

M www/index.wiki

+1 -1

		--- www/index.wiki
		+++ www/index.wiki
		@@ -14,11 +14,11 @@
14	14	<li> [./userlinks.wiki \| User Links]
15	15	<li> [./hacker-howto.wiki \| Hacker How-To]
16	16	<li> [./fossil-v-git.wiki \| Fossil vs. Git]
17	17	<li> [./permutedindex.html \| Doc Index]
18	18	</ul>
19		-<center><img src="fossil3.gif" align="center" alt="Fossil logo"></center>
	19	+<p style="align:center"><img src="fossil3.gif" alt="Fossil logo"></p>
20	20	</div>
21	21
22	22	Fossil is a simple, high-reliability, distributed software configuration
23	23	management system with these advanced features:
24	24
25	25

	--- www/index.wiki
	+++ www/index.wiki
	@@ -14,11 +14,11 @@
14	<li> [./userlinks.wiki \| User Links]
15	<li> [./hacker-howto.wiki \| Hacker How-To]
16	<li> [./fossil-v-git.wiki \| Fossil vs. Git]
17	<li> [./permutedindex.html \| Doc Index]
18	</ul>
19	<center><img src="fossil3.gif" align="center" alt="Fossil logo"></center>
20	</div>
21
22	Fossil is a simple, high-reliability, distributed software configuration
23	management system with these advanced features:
24
25

	--- www/index.wiki
	+++ www/index.wiki
	@@ -14,11 +14,11 @@
14	<li> [./userlinks.wiki \| User Links]
15	<li> [./hacker-howto.wiki \| Hacker How-To]
16	<li> [./fossil-v-git.wiki \| Fossil vs. Git]
17	<li> [./permutedindex.html \| Doc Index]
18	</ul>
19	<p style="align:center"><img src="fossil3.gif" alt="Fossil logo"></p>
20	</div>
21
22	Fossil is a simple, high-reliability, distributed software configuration
23	management system with these advanced features:
24
25

M www/mkindex.tcl

+1 -3

		--- www/mkindex.tcl
		+++ www/mkindex.tcl
		@@ -153,16 +153,14 @@
153	153	set out [open permutedindex.html w]
154	154	fconfigure $out -encoding utf-8 -translation lf
155	155	puts $out \
156	156	"<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
157	157	puts $out {
158		-<center>
159		-<form action='$ROOT/docsrch' method='GET'>
	158	+<form action='$ROOT/docsrch' method='GET' style="text-align:center">
160	159	<input type="text" name="s" size="40" autofocus>
161	160	<input type="submit" value="Search Docs">
162	161	</form>
163		-</center>
164	162	<h2>Primary Documents:</h2>
165	163	<ul>
166	164	<li> <a href='quickstart.wiki'>Quick-start Guide</a>
167	165	<li> <a href='$ROOT/help'>Built-in help for commands and webpages</a>
168	166	<li> <a href='history.md'>Purpose and History of Fossil</a>
169	167

	--- www/mkindex.tcl
	+++ www/mkindex.tcl
	@@ -153,16 +153,14 @@
153	set out [open permutedindex.html w]
154	fconfigure $out -encoding utf-8 -translation lf
155	puts $out \
156	"<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
157	puts $out {
158	<center>
159	<form action='$ROOT/docsrch' method='GET'>
160	<input type="text" name="s" size="40" autofocus>
161	<input type="submit" value="Search Docs">
162	</form>
163	</center>
164	<h2>Primary Documents:</h2>
165	<ul>
166	<li> <a href='quickstart.wiki'>Quick-start Guide</a>
167	<li> <a href='$ROOT/help'>Built-in help for commands and webpages</a>
168	<li> <a href='history.md'>Purpose and History of Fossil</a>
169

	--- www/mkindex.tcl
	+++ www/mkindex.tcl
	@@ -153,16 +153,14 @@
153	set out [open permutedindex.html w]
154	fconfigure $out -encoding utf-8 -translation lf
155	puts $out \
156	"<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
157	puts $out {
158	<form action='$ROOT/docsrch' method='GET' style="text-align:center">

159	<input type="text" name="s" size="40" autofocus>
160	<input type="submit" value="Search Docs">
161	</form>

162	<h2>Primary Documents:</h2>
163	<ul>
164	<li> <a href='quickstart.wiki'>Quick-start Guide</a>
165	<li> <a href='$ROOT/help'>Built-in help for commands and webpages</a>
166	<li> <a href='history.md'>Purpose and History of Fossil</a>
167

M www/permutedindex.html

+1 -3

		--- www/permutedindex.html
		+++ www/permutedindex.html
		@@ -1,13 +1,11 @@
1	1	<div class='fossil-doc' data-title='Index Of Fossil Documentation'>
2	2
3		-<center>
4		-<form action='$ROOT/docsrch' method='GET'>
	3	+<form action='$ROOT/docsrch' method='GET' style="text-align:center">
5	4	<input type="text" name="s" size="40" autofocus>
6	5	<input type="submit" value="Search Docs">
7	6	</form>
8		-</center>
9	7	<h2>Primary Documents:</h2>
10	8	<ul>
11	9	<li> <a href='quickstart.wiki'>Quick-start Guide</a>
12	10	<li> <a href='$ROOT/help'>Built-in help for commands and webpages</a>
13	11	<li> <a href='history.md'>Purpose and History of Fossil</a>
14	12

	--- www/permutedindex.html
	+++ www/permutedindex.html
	@@ -1,13 +1,11 @@
1	<div class='fossil-doc' data-title='Index Of Fossil Documentation'>
2
3	<center>
4	<form action='$ROOT/docsrch' method='GET'>
5	<input type="text" name="s" size="40" autofocus>
6	<input type="submit" value="Search Docs">
7	</form>
8	</center>
9	<h2>Primary Documents:</h2>
10	<ul>
11	<li> <a href='quickstart.wiki'>Quick-start Guide</a>
12	<li> <a href='$ROOT/help'>Built-in help for commands and webpages</a>
13	<li> <a href='history.md'>Purpose and History of Fossil</a>
14

	--- www/permutedindex.html
	+++ www/permutedindex.html
	@@ -1,13 +1,11 @@
1	<div class='fossil-doc' data-title='Index Of Fossil Documentation'>
2
3	<form action='$ROOT/docsrch' method='GET' style="text-align:center">

4	<input type="text" name="s" size="40" autofocus>
5	<input type="submit" value="Search Docs">
6	</form>

7	<h2>Primary Documents:</h2>
8	<ul>
9	<li> <a href='quickstart.wiki'>Quick-start Guide</a>
10	<li> <a href='$ROOT/help'>Built-in help for commands and webpages</a>
11	<li> <a href='history.md'>Purpose and History of Fossil</a>
12

M www/rebaseharm.md

+3 -2

		--- www/rebaseharm.md
		+++ www/rebaseharm.md
		@@ -198,15 +198,16 @@
198	198
199	199	But that argument is comparing apples to oranges, since the two diffs
200	200	do not have the same baseline. The correct way to see only the feature
201	201	branch changes in the merge case is not diff(C2,C7) but rather diff(C6,C7).
202	202
203		-<center><table border="1" cellpadding="5" cellspacing="0">
	203	+<table border="1" cellpadding="5" cellspacing="0"
	204	+ style="margin-left:auto; margin-right:auto">
204	205	<tr><th>Rebase<th>Merge<th>What You See
205	206	<tr><td>diff(C2,C5\')<td>diff(C2,C7)<td>Commingled branch and mainline changes
206	207	<tr><td>diff(C6,C5\')<td>diff(C6,C7)<td>Branch changes only
207		-</table></center>
	208	+</table>
208	209
209	210	Remember: C7 and C5\' are bit-for-bit identical, so the output of the
210	211	diff is not determined by whether you select C7 or C5\' as the target
211	212	of the diff, but rather by your choice of the diff source, C2 or C6.
212	213
213	214

	--- www/rebaseharm.md
	+++ www/rebaseharm.md
	@@ -198,15 +198,16 @@
198
199	But that argument is comparing apples to oranges, since the two diffs
200	do not have the same baseline. The correct way to see only the feature
201	branch changes in the merge case is not diff(C2,C7) but rather diff(C6,C7).
202
203	<center><table border="1" cellpadding="5" cellspacing="0">

204	<tr><th>Rebase<th>Merge<th>What You See
205	<tr><td>diff(C2,C5\')<td>diff(C2,C7)<td>Commingled branch and mainline changes
206	<tr><td>diff(C6,C5\')<td>diff(C6,C7)<td>Branch changes only
207	</table></center>
208
209	Remember: C7 and C5\' are bit-for-bit identical, so the output of the
210	diff is not determined by whether you select C7 or C5\' as the target
211	of the diff, but rather by your choice of the diff source, C2 or C6.
212
213

	--- www/rebaseharm.md
	+++ www/rebaseharm.md
	@@ -198,15 +198,16 @@
198
199	But that argument is comparing apples to oranges, since the two diffs
200	do not have the same baseline. The correct way to see only the feature
201	branch changes in the merge case is not diff(C2,C7) but rather diff(C6,C7).
202
203	<table border="1" cellpadding="5" cellspacing="0"
204	style="margin-left:auto; margin-right:auto">
205	<tr><th>Rebase<th>Merge<th>What You See
206	<tr><td>diff(C2,C5\')<td>diff(C2,C7)<td>Commingled branch and mainline changes
207	<tr><td>diff(C6,C5\')<td>diff(C6,C7)<td>Branch changes only
208	</table>
209
210	Remember: C7 and C5\' are bit-for-bit identical, so the output of the
211	diff is not determined by whether you select C7 or C5\' as the target
212	of the diff, but rather by your choice of the diff source, C2 or C6.
213
214

Fossil SCM

Keyboard Shortcuts