Fossil SCM

Remove the "Draft" notation from the rebase document. Link the new document into the documentation index.

drh 2019-09-05 13:33 trunk
Commit 569cc741d65fbd3857d4998cc3f59fac5bb41a90f6ede7177f235bb4c13c5e7c
Parent d6222f894589236…
4 files changed +5 -4 +1 +3 -2
~ www/fossil-v-git.wiki ~ www/mkindex.tcl ~ www/permutedindex.html ~ www/rebaseharm.md
M www/fossil-v-git.wiki
+5 -4
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -667,14 +667,15 @@
667667
 <h3 id="missing-in-fossil">3.2 Features found in Git but missing from Fossil</h3>
668668
669669
 * <b>Rebase</b>
670670
671671
 Because of its emphasis on recording history exactly as it happened,
672
- rather than as we would have liked it to happen, Fossil deliberately
673
- does not provide a "rebase" command. One can rebase manually in Fossil,
674
- with sufficient perseverance, but it is not something that can be done with
675
- a single command.
672
+ rather than as we would have liked it to happen,
673
+ [./rebaseharm.md|Fossil deliberately omits the "rebase" command].
674
+ For those rare
675
+ occasions where something like rebase is actually needed, the same
676
+ topology can be achieved using cherrypick merges.
676677
677678
 * <b>Push or pull a single branch</b>
678679
679680
 The [/help?cmd=push|fossil push], [/help?cmd=pull|fossil pull], and
680681
 [/help?cmd=sync|fossil sync] commands do not provide the capability to
681682
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -667,14 +667,15 @@
667 <h3 id="missing-in-fossil">3.2 Features found in Git but missing from Fossil</h3>
668
669 * <b>Rebase</b>
670
671 Because of its emphasis on recording history exactly as it happened,
672 rather than as we would have liked it to happen, Fossil deliberately
673 does not provide a "rebase" command. One can rebase manually in Fossil,
674 with sufficient perseverance, but it is not something that can be done with
675 a single command.
 
676
677 * <b>Push or pull a single branch</b>
678
679 The [/help?cmd=push|fossil push], [/help?cmd=pull|fossil pull], and
680 [/help?cmd=sync|fossil sync] commands do not provide the capability to
681
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -667,14 +667,15 @@
667 <h3 id="missing-in-fossil">3.2 Features found in Git but missing from Fossil</h3>
668
669 * <b>Rebase</b>
670
671 Because of its emphasis on recording history exactly as it happened,
672 rather than as we would have liked it to happen,
673 [./rebaseharm.md|Fossil deliberately omits the "rebase" command].
674 For those rare
675 occasions where something like rebase is actually needed, the same
676 topology can be achieved using cherrypick merges.
677
678 * <b>Push or pull a single branch</b>
679
680 The [/help?cmd=push|fossil push], [/help?cmd=pull|fossil pull], and
681 [/help?cmd=sync|fossil sync] commands do not provide the capability to
682
M www/mkindex.tcl
+1
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -70,10 +70,11 @@
7070
 qandc.wiki {Questions And Criticisms}
7171
 quickstart.wiki {Fossil Quick Start Guide}
7272
 quotes.wiki
7373
 {Quotes: What People Are Saying About Fossil, Git, and DVCSes in General}
7474
 ../test/release-checklist.wiki {Pre-Release Testing Checklist}
75
+ rebaseharm.md {Rebase Considered Harmful}
7576
 reviews.wiki {Reviews}
7677
 selfcheck.wiki {Fossil Repository Integrity Self Checks}
7778
 selfhost.wiki {Fossil Self Hosting Repositories}
7879
 server/ {How To Configure A Fossil Server}
7980
 serverext.wiki {CGI Server Extensions}
8081
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -70,10 +70,11 @@
70 qandc.wiki {Questions And Criticisms}
71 quickstart.wiki {Fossil Quick Start Guide}
72 quotes.wiki
73 {Quotes: What People Are Saying About Fossil, Git, and DVCSes in General}
74 ../test/release-checklist.wiki {Pre-Release Testing Checklist}
 
75 reviews.wiki {Reviews}
76 selfcheck.wiki {Fossil Repository Integrity Self Checks}
77 selfhost.wiki {Fossil Self Hosting Repositories}
78 server/ {How To Configure A Fossil Server}
79 serverext.wiki {CGI Server Extensions}
80
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -70,10 +70,11 @@
70 qandc.wiki {Questions And Criticisms}
71 quickstart.wiki {Fossil Quick Start Guide}
72 quotes.wiki
73 {Quotes: What People Are Saying About Fossil, Git, and DVCSes in General}
74 ../test/release-checklist.wiki {Pre-Release Testing Checklist}
75 rebaseharm.md {Rebase Considered Harmful}
76 reviews.wiki {Reviews}
77 selfcheck.wiki {Fossil Repository Integrity Self Checks}
78 selfhost.wiki {Fossil Self Hosting Repositories}
79 server/ {How To Configure A Fossil Server}
80 serverext.wiki {CGI Server Extensions}
81
M www/permutedindex.html
+3
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -68,10 +68,11 @@
6868
 <li><a href="../../../help">Commands and Webpages &mdash; Lists of</a></li>
6969
 <li><a href="build.wiki"><b>Compiling and Installing Fossil</b></a></li>
7070
 <li><a href="concepts.wiki">Concepts &mdash; Fossil Core</a></li>
7171
 <li><a href="cgi.wiki">Configuration Options &mdash; CGI Script</a></li>
7272
 <li><a href="server/">Configure A Fossil Server &mdash; How To</a></li>
73
+<li><a href="rebaseharm.md">Considered Harmful &mdash; Rebase</a></li>
7374
 <li><a href="shunning.wiki">Content From Fossil &mdash; Shunning: Deleting</a></li>
7475
 <li><a href="defcsp.md">Content Security Policy &mdash; The Default</a></li>
7576
 <li><a href="contribute.wiki"><b>Contributing Code or Documentation To The Fossil Project</b></a></li>
7677
 <li><a href="copyright-release.html"><b>Contributor License Agreement</b></a></li>
7778
 <li><a href="whyusefossil.wiki">Control &mdash; Benefits Of Version</a></li>
@@ -151,10 +152,11 @@
151152
 <li><a href="grep.md">grep vs POSIX grep &mdash; Fossil</a></li>
152153
 <li><a href="quickstart.wiki">Guide &mdash; Fossil Quick Start</a></li>
153154
 <li><a href="style.wiki">Guidelines &mdash; Source Code Style</a></li>
154155
 <li><a href="hacker-howto.wiki"><b>Hacker How-To</b></a></li>
155156
 <li><a href="adding_code.wiki"><b>Hacking Fossil</b></a></li>
157
+<li><a href="rebaseharm.md">Harmful &mdash; Rebase Considered</a></li>
156158
 <li><a href="hashpolicy.wiki"><b>Hash Policy: Choosing Between SHA1 and SHA3-256</b></a></li>
157159
 <li><a href="hints.wiki">Hints &mdash; Fossil Tips And Usage</a></li>
158160
 <li><a href="index.wiki"><b>Home Page</b></a></li>
159161
 <li><a href="selfhost.wiki">Hosting Repositories &mdash; Fossil Self</a></li>
160162
 <li><a href="aboutcgi.wiki"><b>How CGI Works In Fossil</b></a></li>
@@ -220,10 +222,11 @@
220222
 <li><a href="tls-nginx.md"><b>Proxying Fossil via HTTPS with nginx</b></a></li>
221223
 <li><a href="faq.wiki">Questions &mdash; Frequently Asked</a></li>
222224
 <li><a href="qandc.wiki"><b>Questions And Criticisms</b></a></li>
223225
 <li><a href="quickstart.wiki">Quick Start Guide &mdash; Fossil</a></li>
224226
 <li><a href="quotes.wiki"><b>Quotes: What People Are Saying About Fossil, Git, and DVCSes in General</b></a></li>
227
+<li><a href="rebaseharm.md"><b>Rebase Considered Harmful</b></a></li>
225228
 <li><a href="caps/ref.html">Reference &mdash; User Capability</a></li>
226229
 <li><a href="image-format-vs-repo-size.md">Repo Size &mdash; Image Format vs Fossil</a></li>
227230
 <li><a href="selfhost.wiki">Repositories &mdash; Fossil Self Hosting</a></li>
228231
 <li><a href="encryptedrepos.wiki">Repositories &mdash; How To Use Encrypted</a></li>
229232
 <li><a href="newrepo.wiki">Repository &mdash; How To Create A New Fossil</a></li>
230233
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -68,10 +68,11 @@
68 <li><a href="../../../help">Commands and Webpages &mdash; Lists of</a></li>
69 <li><a href="build.wiki"><b>Compiling and Installing Fossil</b></a></li>
70 <li><a href="concepts.wiki">Concepts &mdash; Fossil Core</a></li>
71 <li><a href="cgi.wiki">Configuration Options &mdash; CGI Script</a></li>
72 <li><a href="server/">Configure A Fossil Server &mdash; How To</a></li>
 
73 <li><a href="shunning.wiki">Content From Fossil &mdash; Shunning: Deleting</a></li>
74 <li><a href="defcsp.md">Content Security Policy &mdash; The Default</a></li>
75 <li><a href="contribute.wiki"><b>Contributing Code or Documentation To The Fossil Project</b></a></li>
76 <li><a href="copyright-release.html"><b>Contributor License Agreement</b></a></li>
77 <li><a href="whyusefossil.wiki">Control &mdash; Benefits Of Version</a></li>
@@ -151,10 +152,11 @@
151 <li><a href="grep.md">grep vs POSIX grep &mdash; Fossil</a></li>
152 <li><a href="quickstart.wiki">Guide &mdash; Fossil Quick Start</a></li>
153 <li><a href="style.wiki">Guidelines &mdash; Source Code Style</a></li>
154 <li><a href="hacker-howto.wiki"><b>Hacker How-To</b></a></li>
155 <li><a href="adding_code.wiki"><b>Hacking Fossil</b></a></li>
 
156 <li><a href="hashpolicy.wiki"><b>Hash Policy: Choosing Between SHA1 and SHA3-256</b></a></li>
157 <li><a href="hints.wiki">Hints &mdash; Fossil Tips And Usage</a></li>
158 <li><a href="index.wiki"><b>Home Page</b></a></li>
159 <li><a href="selfhost.wiki">Hosting Repositories &mdash; Fossil Self</a></li>
160 <li><a href="aboutcgi.wiki"><b>How CGI Works In Fossil</b></a></li>
@@ -220,10 +222,11 @@
220 <li><a href="tls-nginx.md"><b>Proxying Fossil via HTTPS with nginx</b></a></li>
221 <li><a href="faq.wiki">Questions &mdash; Frequently Asked</a></li>
222 <li><a href="qandc.wiki"><b>Questions And Criticisms</b></a></li>
223 <li><a href="quickstart.wiki">Quick Start Guide &mdash; Fossil</a></li>
224 <li><a href="quotes.wiki"><b>Quotes: What People Are Saying About Fossil, Git, and DVCSes in General</b></a></li>
 
225 <li><a href="caps/ref.html">Reference &mdash; User Capability</a></li>
226 <li><a href="image-format-vs-repo-size.md">Repo Size &mdash; Image Format vs Fossil</a></li>
227 <li><a href="selfhost.wiki">Repositories &mdash; Fossil Self Hosting</a></li>
228 <li><a href="encryptedrepos.wiki">Repositories &mdash; How To Use Encrypted</a></li>
229 <li><a href="newrepo.wiki">Repository &mdash; How To Create A New Fossil</a></li>
230
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -68,10 +68,11 @@
68 <li><a href="../../../help">Commands and Webpages &mdash; Lists of</a></li>
69 <li><a href="build.wiki"><b>Compiling and Installing Fossil</b></a></li>
70 <li><a href="concepts.wiki">Concepts &mdash; Fossil Core</a></li>
71 <li><a href="cgi.wiki">Configuration Options &mdash; CGI Script</a></li>
72 <li><a href="server/">Configure A Fossil Server &mdash; How To</a></li>
73 <li><a href="rebaseharm.md">Considered Harmful &mdash; Rebase</a></li>
74 <li><a href="shunning.wiki">Content From Fossil &mdash; Shunning: Deleting</a></li>
75 <li><a href="defcsp.md">Content Security Policy &mdash; The Default</a></li>
76 <li><a href="contribute.wiki"><b>Contributing Code or Documentation To The Fossil Project</b></a></li>
77 <li><a href="copyright-release.html"><b>Contributor License Agreement</b></a></li>
78 <li><a href="whyusefossil.wiki">Control &mdash; Benefits Of Version</a></li>
@@ -151,10 +152,11 @@
152 <li><a href="grep.md">grep vs POSIX grep &mdash; Fossil</a></li>
153 <li><a href="quickstart.wiki">Guide &mdash; Fossil Quick Start</a></li>
154 <li><a href="style.wiki">Guidelines &mdash; Source Code Style</a></li>
155 <li><a href="hacker-howto.wiki"><b>Hacker How-To</b></a></li>
156 <li><a href="adding_code.wiki"><b>Hacking Fossil</b></a></li>
157 <li><a href="rebaseharm.md">Harmful &mdash; Rebase Considered</a></li>
158 <li><a href="hashpolicy.wiki"><b>Hash Policy: Choosing Between SHA1 and SHA3-256</b></a></li>
159 <li><a href="hints.wiki">Hints &mdash; Fossil Tips And Usage</a></li>
160 <li><a href="index.wiki"><b>Home Page</b></a></li>
161 <li><a href="selfhost.wiki">Hosting Repositories &mdash; Fossil Self</a></li>
162 <li><a href="aboutcgi.wiki"><b>How CGI Works In Fossil</b></a></li>
@@ -220,10 +222,11 @@
222 <li><a href="tls-nginx.md"><b>Proxying Fossil via HTTPS with nginx</b></a></li>
223 <li><a href="faq.wiki">Questions &mdash; Frequently Asked</a></li>
224 <li><a href="qandc.wiki"><b>Questions And Criticisms</b></a></li>
225 <li><a href="quickstart.wiki">Quick Start Guide &mdash; Fossil</a></li>
226 <li><a href="quotes.wiki"><b>Quotes: What People Are Saying About Fossil, Git, and DVCSes in General</b></a></li>
227 <li><a href="rebaseharm.md"><b>Rebase Considered Harmful</b></a></li>
228 <li><a href="caps/ref.html">Reference &mdash; User Capability</a></li>
229 <li><a href="image-format-vs-repo-size.md">Repo Size &mdash; Image Format vs Fossil</a></li>
230 <li><a href="selfhost.wiki">Repositories &mdash; Fossil Self Hosting</a></li>
231 <li><a href="encryptedrepos.wiki">Repositories &mdash; How To Use Encrypted</a></li>
232 <li><a href="newrepo.wiki">Repository &mdash; How To Create A New Fossil</a></li>
233
M www/rebaseharm.md
-2
--- www/rebaseharm.md
+++ www/rebaseharm.md
@@ -1,9 +1,7 @@
11
 # Rebase Considered Harmful
22
3
-<center><font color="red"><big>** DRAFT **</big></font></center>
4
-
53
 Fossil deliberately does not implement "rebase", because the original
64
 designer of Fossil (and author of this article) considers rebase to be
75
 an anti-pattern to be avoided. This article attempts to
86
 explain that point of view.
97
108
--- www/rebaseharm.md
+++ www/rebaseharm.md
@@ -1,9 +1,7 @@
1 # Rebase Considered Harmful
2
3 <center><font color="red"><big>** DRAFT **</big></font></center>
4
5 Fossil deliberately does not implement "rebase", because the original
6 designer of Fossil (and author of this article) considers rebase to be
7 an anti-pattern to be avoided. This article attempts to
8 explain that point of view.
9
10
--- www/rebaseharm.md
+++ www/rebaseharm.md
@@ -1,9 +1,7 @@
1 # Rebase Considered Harmful
2
 
 
3 Fossil deliberately does not implement "rebase", because the original
4 designer of Fossil (and author of this article) considers rebase to be
5 an anti-pattern to be avoided. This article attempts to
6 explain that point of view.
7
8

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button