Fossil SCM

More FAQ updates. Add the document on "shunning".

drh 2009-08-26 19:50 trunk
Commit d6b8b5ba7370b3946b29d1ec0cc7ed1780e0893e
Parent 85c6542a1614069…
4 files changed +23 -5 +9 -4 +1 +52
~ www/faq.tcl ~ www/faq.wiki ~ www/index.wiki + www/shunning.wiki
M www/faq.tcl
+23 -5
--- www/faq.tcl
+++ www/faq.tcl
@@ -66,16 +66,34 @@
6666
6767
 faq {
6868
 How do I create a private branch that won't get pushed back to the
6969
 main repository.
7070
 } {
71
- You cannot. All branches in fossil are public in the sense that
72
- are all pushed and pulled together. There is no way to tell fossil
73
- to only push or pull a subset of branches.
71
+ Use the <b>--private</b> command-line option on the
72
+ <b>commit</b> command. The result will be a check-in which exists on
73
+ your local repository only and is never pushed to other repositories.
74
+ All descendents of a private check-in are also private.
75
+
76
+ Unless you specify something different using the <b>--branch</b> and/or
77
+ <b>--bgcolor</b> options, the new private check-in will be put on a branch
78
+ named "private" with an orange background color.
79
+
80
+ You can merge from the trunk into your private branch in order to keep
81
+ your private branch in sync with the latest changes on the trunk. Once
82
+ you have everything in your private branch the way you want it, you can
83
+ then merge your private branch back into the trunk and push. Only the
84
+ final merge operation will appear in other repositories. It will seem
85
+ as if all the changes that occurred on your private branch occurred in
86
+ a single check-in.
87
+ Of course, you can also keep your branch private forever simply
88
+ by not merging the changes in the private branch back into the trunk.
89
+}
7490
75
- Of course, as long as you never push, you can make as many private
76
- changes as you want.
91
+faq {
92
+ How can I delete inappropriate content from my fossil repository?
93
+} {
94
+ See the article on [./shunning.wiki | "shunning"] for details.
7795
 }
7896
7997
8098
8199
 #############################################################################
82100
--- www/faq.tcl
+++ www/faq.tcl
@@ -66,16 +66,34 @@
66
67 faq {
68 How do I create a private branch that won't get pushed back to the
69 main repository.
70 } {
71 You cannot. All branches in fossil are public in the sense that
72 are all pushed and pulled together. There is no way to tell fossil
73 to only push or pull a subset of branches.
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
74
75 Of course, as long as you never push, you can make as many private
76 changes as you want.
 
 
77 }
78
79
80
81 #############################################################################
82
--- www/faq.tcl
+++ www/faq.tcl
@@ -66,16 +66,34 @@
66
67 faq {
68 How do I create a private branch that won't get pushed back to the
69 main repository.
70 } {
71 Use the <b>--private</b> command-line option on the
72 <b>commit</b> command. The result will be a check-in which exists on
73 your local repository only and is never pushed to other repositories.
74 All descendents of a private check-in are also private.
75
76 Unless you specify something different using the <b>--branch</b> and/or
77 <b>--bgcolor</b> options, the new private check-in will be put on a branch
78 named "private" with an orange background color.
79
80 You can merge from the trunk into your private branch in order to keep
81 your private branch in sync with the latest changes on the trunk. Once
82 you have everything in your private branch the way you want it, you can
83 then merge your private branch back into the trunk and push. Only the
84 final merge operation will appear in other repositories. It will seem
85 as if all the changes that occurred on your private branch occurred in
86 a single check-in.
87 Of course, you can also keep your branch private forever simply
88 by not merging the changes in the private branch back into the trunk.
89 }
90
91 faq {
92 How can I delete inappropriate content from my fossil repository?
93 } {
94 See the article on [./shunning.wiki | "shunning"] for details.
95 }
96
97
98
99 #############################################################################
100
M www/faq.wiki
+9 -4
--- www/faq.wiki
+++ www/faq.wiki
@@ -6,10 +6,11 @@
66
 <li><a href="#q1">What GUIs are available for fossil?</a></li>
77
 <li><a href="#q2">What is the difference between a "branch" and a "fork"?</a></li>
88
 <li><a href="#q3">How do I create a new branch in fossil?</a></li>
99
 <li><a href="#q4">How do I create a private branch that won't get pushed back to the
1010
 main repository.</a></li>
11
+<li><a href="#q5">How can I delete inappropriate content from my fossil repository?</a></li>
1112
 </ol>
1213
 <hr>
1314
 <a name="q1"></a>
1415
 <p><b>(1) What GUIs are available for fossil?</b></p>
1516
@@ -77,13 +78,17 @@
7778
7879
 You can merge from the trunk into your private branch in order to keep
7980
 your private branch in sync with the latest changes on the trunk. Once
8081
 you have everything in your private branch the way you want it, you can
8182
 then merge your private branch back into the trunk and push. Only the
82
-final merge operation will appear in other repositories. It will appear
83
+final merge operation will appear in other repositories. It will seem
8384
 as if all the changes that occurred on your private branch occurred in
8485
 a single check-in.
85
-Of course, you can also keep your private branch private forever simply
86
-by not merging the changes in the private branch back into the trunk.
87
-</blockquote></li>
86
+Of course, you can also keep your branch private forever simply
87
+by not merging the changes in the private branch back into the trunk.</blockquote></li>
88
+
89
+<a name="q5"></a>
90
+<p><b>(5) How can I delete inappropriate content from my fossil repository?</b></p>
91
+
92
+<blockquote>See the article on [./shunning.wiki | "shunning"] for details.</blockquote></li>
8893
8994
 </ol>
9095
--- www/faq.wiki
+++ www/faq.wiki
@@ -6,10 +6,11 @@
6 <li><a href="#q1">What GUIs are available for fossil?</a></li>
7 <li><a href="#q2">What is the difference between a "branch" and a "fork"?</a></li>
8 <li><a href="#q3">How do I create a new branch in fossil?</a></li>
9 <li><a href="#q4">How do I create a private branch that won't get pushed back to the
10 main repository.</a></li>
 
11 </ol>
12 <hr>
13 <a name="q1"></a>
14 <p><b>(1) What GUIs are available for fossil?</b></p>
15
@@ -77,13 +78,17 @@
77
78 You can merge from the trunk into your private branch in order to keep
79 your private branch in sync with the latest changes on the trunk. Once
80 you have everything in your private branch the way you want it, you can
81 then merge your private branch back into the trunk and push. Only the
82 final merge operation will appear in other repositories. It will appear
83 as if all the changes that occurred on your private branch occurred in
84 a single check-in.
85 Of course, you can also keep your private branch private forever simply
86 by not merging the changes in the private branch back into the trunk.
87 </blockquote></li>
 
 
 
 
88
89 </ol>
90
--- www/faq.wiki
+++ www/faq.wiki
@@ -6,10 +6,11 @@
6 <li><a href="#q1">What GUIs are available for fossil?</a></li>
7 <li><a href="#q2">What is the difference between a "branch" and a "fork"?</a></li>
8 <li><a href="#q3">How do I create a new branch in fossil?</a></li>
9 <li><a href="#q4">How do I create a private branch that won't get pushed back to the
10 main repository.</a></li>
11 <li><a href="#q5">How can I delete inappropriate content from my fossil repository?</a></li>
12 </ol>
13 <hr>
14 <a name="q1"></a>
15 <p><b>(1) What GUIs are available for fossil?</b></p>
16
@@ -77,13 +78,17 @@
78
79 You can merge from the trunk into your private branch in order to keep
80 your private branch in sync with the latest changes on the trunk. Once
81 you have everything in your private branch the way you want it, you can
82 then merge your private branch back into the trunk and push. Only the
83 final merge operation will appear in other repositories. It will seem
84 as if all the changes that occurred on your private branch occurred in
85 a single check-in.
86 Of course, you can also keep your branch private forever simply
87 by not merging the changes in the private branch back into the trunk.</blockquote></li>
88
89 <a name="q5"></a>
90 <p><b>(5) How can I delete inappropriate content from my fossil repository?</b></p>
91
92 <blockquote>See the article on [./shunning.wiki | "shunning"] for details.</blockquote></li>
93
94 </ol>
95
M www/index.wiki
+1
--- www/index.wiki
+++ www/index.wiki
@@ -78,10 +78,11 @@
7878
 * There is a
7979
 [http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users | mailing list]
8080
 available for discussing fossil issues.
8181
 * [./stats.wiki | Performance statistics] taken from real-world projects
8282
 hosted on fossil.
83
+ * How to [./shunning.wiki | delete content] from a fossil repository.
8384
 * Some (unfinished but expanding) extended
8485
 [./reference.wiki | reference documentation] for the fossil command line.
8586
8687
 <h3>Developer Links:</h3>
8788
8889
8990
ADDED www/shunning.wiki
--- www/index.wiki
+++ www/index.wiki
@@ -78,10 +78,11 @@
78 * There is a
79 [http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users | mailing list]
80 available for discussing fossil issues.
81 * [./stats.wiki | Performance statistics] taken from real-world projects
82 hosted on fossil.
 
83 * Some (unfinished but expanding) extended
84 [./reference.wiki | reference documentation] for the fossil command line.
85
86 <h3>Developer Links:</h3>
87
88
89 DDED www/shunning.wiki
--- www/index.wiki
+++ www/index.wiki
@@ -78,10 +78,11 @@
78 * There is a
79 [http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users | mailing list]
80 available for discussing fossil issues.
81 * [./stats.wiki | Performance statistics] taken from real-world projects
82 hosted on fossil.
83 * How to [./shunning.wiki | delete content] from a fossil repository.
84 * Some (unfinished but expanding) extended
85 [./reference.wiki | reference documentation] for the fossil command line.
86
87 <h3>Developer Links:</h3>
88
89
90 DDED www/shunning.wiki
A www/shunning.wiki
+52
--- a/www/shunning.wiki
+++ b/www/shunning.wiki
@@ -0,0 +1,52 @@
1
+
2
+<h2>Alternatives<h1 align="center"lternatives</h2>
3
+
4
+All of these h1igned to
5
+foil spammers up front], l Users
6
+of Fossil are discouraged from "deleting" content simply because it
7
+has become obsolete. Old content is part of the historical record
8
+(part of the "fose we get to
9
+methods of .
10
+Such is ives that usually suffice, which don't damage the<ul>
11
+ <li><p>ect's
12
+fossil record:
13
+
14
+ * When a forum post or wiki article is "dleted," what actually
15
+ happens is that a new empty version is added to he Fossil ril</title>
16
+
17
+<h2>Good Reasons for Removing Content from a Fossil Repo<title>DelWhen you close a ticket, it's marked in a way that causes it
18
+ <title>Deleting Content From Fossil</title>
19
+
20
+<h2>Good Reasons for Remitle>Deleting Content From Fossil</title>
21
+
22
+<h2>Good Reasons for Remo is no value in keeping it, so it is best removed permanently.
23
+
24
+ * Afile that contains </p></li>
25
+
26
+ <li><p>one else's
27
+ copyri
28
+
29
+Everyechanism. An artitrol artifact was inserted andis disrupting the
30
+ SHA1 operation of Fossil.
31
+
32
+ * A legitim ed requiring content to
33
+ ed using the
34
+"rebuild" command.
35
+
36
+<h3>Shunning lists are local state</h3>
37
+
38
+The shunning list is part of the local state of a Fossil repository.
39
+In nedother words, shunning does not propagate to a remote repository
40
+using the normal "sync" mechanism. An artifact can be
41
+shunned from one repository but be allowed to exist in a shunning list does not propagatpropagated then a malic
42
+st propagated then a malicious user (or
43
+a bug in the fossil code) might introduce a shun record that would
44
+propagate through all repositories in a network and permanently
45
+destroy vital information. By refusing to propagate the shunning e="center"lternatives</h2>
46
+
47
+All of these h1igned to
48
+foil spammers up front], l U
49
+tories without your permissisives<h1 align="center"lternatives</h2>
50
+
51
+All of these h1igned to
52
+foil spammers up f
--- a/www/shunning.wiki
+++ b/www/shunning.wiki
@@ -0,0 +1,52 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/www/shunning.wiki
+++ b/www/shunning.wiki
@@ -0,0 +1,52 @@
1
2 <h2>Alternatives<h1 align="center"lternatives</h2>
3
4 All of these h1igned to
5 foil spammers up front], l Users
6 of Fossil are discouraged from "deleting" content simply because it
7 has become obsolete. Old content is part of the historical record
8 (part of the "fose we get to
9 methods of .
10 Such is ives that usually suffice, which don't damage the<ul>
11 <li><p>ect's
12 fossil record:
13
14 * When a forum post or wiki article is "dleted," what actually
15 happens is that a new empty version is added to he Fossil ril</title>
16
17 <h2>Good Reasons for Removing Content from a Fossil Repo<title>DelWhen you close a ticket, it's marked in a way that causes it
18 <title>Deleting Content From Fossil</title>
19
20 <h2>Good Reasons for Remitle>Deleting Content From Fossil</title>
21
22 <h2>Good Reasons for Remo is no value in keeping it, so it is best removed permanently.
23
24 * Afile that contains </p></li>
25
26 <li><p>one else's
27 copyri
28
29 Everyechanism. An artitrol artifact was inserted andis disrupting the
30 SHA1 operation of Fossil.
31
32 * A legitim ed requiring content to
33 ed using the
34 "rebuild" command.
35
36 <h3>Shunning lists are local state</h3>
37
38 The shunning list is part of the local state of a Fossil repository.
39 In nedother words, shunning does not propagate to a remote repository
40 using the normal "sync" mechanism. An artifact can be
41 shunned from one repository but be allowed to exist in a shunning list does not propagatpropagated then a malic
42 st propagated then a malicious user (or
43 a bug in the fossil code) might introduce a shun record that would
44 propagate through all repositories in a network and permanently
45 destroy vital information. By refusing to propagate the shunning e="center"lternatives</h2>
46
47 All of these h1igned to
48 foil spammers up front], l U
49 tories without your permissisives<h1 align="center"lternatives</h2>
50
51 All of these h1igned to
52 foil spammers up f

Keyboard Shortcuts

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