Fossil SCM

Merge the msw-hack branch into trunk.

drh 2011-08-23 16:55 trunk merge
Commit d41074f86294dc96eedc97b8df9b3b3c0eca3089
2 files changed +14 -7 +14 -7
+14 -7
--- www/checkin.wiki
+++ www/checkin.wiki
@@ -3,38 +3,45 @@
33
<h2><u>Always</u> run the following checklist prior to <u>every</u>
44
check-in or commit to the Fossil repository:</h2>
55
66
Before every check-in:
77
8
- 1. <b>fossil diff</b> &rarr;
8
+ 1. <b>fossil user default</b> &rarr; your username is correct.
9
+
10
+ 2. <b>fossil diff</b> &rarr;
911
<ol type="a">
1012
<li> No stray changes
1113
<li> All changes comply with the license
1214
<li> All inputs are scrubbed before use
1315
<li> No injection attacks via %s formats
1416
</ol>
1517
16
- 2. <b>fossil extra</b> &rarr; no unmanaged files need to be added.
18
+ 3. <b>fossil extra</b> &rarr; no unmanaged files need to be added.
1719
18
- 3. The check-in will go onto the desired branch.
20
+ 4. The check-in will go onto the desired branch.
1921
&rarr; Do <u>not</u> check into trunk without prior approval from
2022
the lead programmer (drh)!
2123
22
- 4. auto-sync is on, or the system clock is verified
24
+ 5. auto-sync is on, or the system clock is verified
2325
24
- 5. If sources files have been added or removed, ensure all makefiles
26
+ 6. If sources files have been added or removed, ensure all makefiles
2527
and configure scripts have been updated accordingly.
2628
2729
Before every check-in to <b>trunk</b>:
2830
29
- 6. No compiler warnings on the development machine.
31
+ 7. No compiler warnings on the development machine.
3032
31
- 7. The fossil executable that results from a build actually works.
33
+ 8. The fossil executable that results from a build actually works.
3234
3335
3436
<hr>
3537
<h2>Commentary</h2>
38
+
39
+Before you go ahead and push content back to the servers, make sure
40
+that the username you are using by default matches your username
41
+within the project. Also remember to enable the localauth setting
42
+if you intend to make changes via a locally served web UI.
3643
3744
Item 1 is the most important step. Consider using <b>gdiff</b>
3845
instead of <b>diff</b> if you have a graphical differ configured. Or,
3946
pipe the output of "<b>fossil diff</b>" into "<b>open -f</b>" (on a mac) to
4047
get the diff output in a separate text window for easier viewing.
4148
--- www/checkin.wiki
+++ www/checkin.wiki
@@ -3,38 +3,45 @@
3 <h2><u>Always</u> run the following checklist prior to <u>every</u>
4 check-in or commit to the Fossil repository:</h2>
5
6 Before every check-in:
7
8 1. <b>fossil diff</b> &rarr;
 
 
9 <ol type="a">
10 <li> No stray changes
11 <li> All changes comply with the license
12 <li> All inputs are scrubbed before use
13 <li> No injection attacks via %s formats
14 </ol>
15
16 2. <b>fossil extra</b> &rarr; no unmanaged files need to be added.
17
18 3. The check-in will go onto the desired branch.
19 &rarr; Do <u>not</u> check into trunk without prior approval from
20 the lead programmer (drh)!
21
22 4. auto-sync is on, or the system clock is verified
23
24 5. If sources files have been added or removed, ensure all makefiles
25 and configure scripts have been updated accordingly.
26
27 Before every check-in to <b>trunk</b>:
28
29 6. No compiler warnings on the development machine.
30
31 7. The fossil executable that results from a build actually works.
32
33
34 <hr>
35 <h2>Commentary</h2>
 
 
 
 
 
36
37 Item 1 is the most important step. Consider using <b>gdiff</b>
38 instead of <b>diff</b> if you have a graphical differ configured. Or,
39 pipe the output of "<b>fossil diff</b>" into "<b>open -f</b>" (on a mac) to
40 get the diff output in a separate text window for easier viewing.
41
--- www/checkin.wiki
+++ www/checkin.wiki
@@ -3,38 +3,45 @@
3 <h2><u>Always</u> run the following checklist prior to <u>every</u>
4 check-in or commit to the Fossil repository:</h2>
5
6 Before every check-in:
7
8 1. <b>fossil user default</b> &rarr; your username is correct.
9
10 2. <b>fossil diff</b> &rarr;
11 <ol type="a">
12 <li> No stray changes
13 <li> All changes comply with the license
14 <li> All inputs are scrubbed before use
15 <li> No injection attacks via %s formats
16 </ol>
17
18 3. <b>fossil extra</b> &rarr; no unmanaged files need to be added.
19
20 4. The check-in will go onto the desired branch.
21 &rarr; Do <u>not</u> check into trunk without prior approval from
22 the lead programmer (drh)!
23
24 5. auto-sync is on, or the system clock is verified
25
26 6. If sources files have been added or removed, ensure all makefiles
27 and configure scripts have been updated accordingly.
28
29 Before every check-in to <b>trunk</b>:
30
31 7. No compiler warnings on the development machine.
32
33 8. The fossil executable that results from a build actually works.
34
35
36 <hr>
37 <h2>Commentary</h2>
38
39 Before you go ahead and push content back to the servers, make sure
40 that the username you are using by default matches your username
41 within the project. Also remember to enable the localauth setting
42 if you intend to make changes via a locally served web UI.
43
44 Item 1 is the most important step. Consider using <b>gdiff</b>
45 instead of <b>diff</b> if you have a graphical differ configured. Or,
46 pipe the output of "<b>fossil diff</b>" into "<b>open -f</b>" (on a mac) to
47 get the diff output in a separate text window for easier viewing.
48
+14 -7
--- www/checkin.wiki
+++ www/checkin.wiki
@@ -3,38 +3,45 @@
33
<h2><u>Always</u> run the following checklist prior to <u>every</u>
44
check-in or commit to the Fossil repository:</h2>
55
66
Before every check-in:
77
8
- 1. <b>fossil diff</b> &rarr;
8
+ 1. <b>fossil user default</b> &rarr; your username is correct.
9
+
10
+ 2. <b>fossil diff</b> &rarr;
911
<ol type="a">
1012
<li> No stray changes
1113
<li> All changes comply with the license
1214
<li> All inputs are scrubbed before use
1315
<li> No injection attacks via %s formats
1416
</ol>
1517
16
- 2. <b>fossil extra</b> &rarr; no unmanaged files need to be added.
18
+ 3. <b>fossil extra</b> &rarr; no unmanaged files need to be added.
1719
18
- 3. The check-in will go onto the desired branch.
20
+ 4. The check-in will go onto the desired branch.
1921
&rarr; Do <u>not</u> check into trunk without prior approval from
2022
the lead programmer (drh)!
2123
22
- 4. auto-sync is on, or the system clock is verified
24
+ 5. auto-sync is on, or the system clock is verified
2325
24
- 5. If sources files have been added or removed, ensure all makefiles
26
+ 6. If sources files have been added or removed, ensure all makefiles
2527
and configure scripts have been updated accordingly.
2628
2729
Before every check-in to <b>trunk</b>:
2830
29
- 6. No compiler warnings on the development machine.
31
+ 7. No compiler warnings on the development machine.
3032
31
- 7. The fossil executable that results from a build actually works.
33
+ 8. The fossil executable that results from a build actually works.
3234
3335
3436
<hr>
3537
<h2>Commentary</h2>
38
+
39
+Before you go ahead and push content back to the servers, make sure
40
+that the username you are using by default matches your username
41
+within the project. Also remember to enable the localauth setting
42
+if you intend to make changes via a locally served web UI.
3643
3744
Item 1 is the most important step. Consider using <b>gdiff</b>
3845
instead of <b>diff</b> if you have a graphical differ configured. Or,
3946
pipe the output of "<b>fossil diff</b>" into "<b>open -f</b>" (on a mac) to
4047
get the diff output in a separate text window for easier viewing.
4148
--- www/checkin.wiki
+++ www/checkin.wiki
@@ -3,38 +3,45 @@
3 <h2><u>Always</u> run the following checklist prior to <u>every</u>
4 check-in or commit to the Fossil repository:</h2>
5
6 Before every check-in:
7
8 1. <b>fossil diff</b> &rarr;
 
 
9 <ol type="a">
10 <li> No stray changes
11 <li> All changes comply with the license
12 <li> All inputs are scrubbed before use
13 <li> No injection attacks via %s formats
14 </ol>
15
16 2. <b>fossil extra</b> &rarr; no unmanaged files need to be added.
17
18 3. The check-in will go onto the desired branch.
19 &rarr; Do <u>not</u> check into trunk without prior approval from
20 the lead programmer (drh)!
21
22 4. auto-sync is on, or the system clock is verified
23
24 5. If sources files have been added or removed, ensure all makefiles
25 and configure scripts have been updated accordingly.
26
27 Before every check-in to <b>trunk</b>:
28
29 6. No compiler warnings on the development machine.
30
31 7. The fossil executable that results from a build actually works.
32
33
34 <hr>
35 <h2>Commentary</h2>
 
 
 
 
 
36
37 Item 1 is the most important step. Consider using <b>gdiff</b>
38 instead of <b>diff</b> if you have a graphical differ configured. Or,
39 pipe the output of "<b>fossil diff</b>" into "<b>open -f</b>" (on a mac) to
40 get the diff output in a separate text window for easier viewing.
41
--- www/checkin.wiki
+++ www/checkin.wiki
@@ -3,38 +3,45 @@
3 <h2><u>Always</u> run the following checklist prior to <u>every</u>
4 check-in or commit to the Fossil repository:</h2>
5
6 Before every check-in:
7
8 1. <b>fossil user default</b> &rarr; your username is correct.
9
10 2. <b>fossil diff</b> &rarr;
11 <ol type="a">
12 <li> No stray changes
13 <li> All changes comply with the license
14 <li> All inputs are scrubbed before use
15 <li> No injection attacks via %s formats
16 </ol>
17
18 3. <b>fossil extra</b> &rarr; no unmanaged files need to be added.
19
20 4. The check-in will go onto the desired branch.
21 &rarr; Do <u>not</u> check into trunk without prior approval from
22 the lead programmer (drh)!
23
24 5. auto-sync is on, or the system clock is verified
25
26 6. If sources files have been added or removed, ensure all makefiles
27 and configure scripts have been updated accordingly.
28
29 Before every check-in to <b>trunk</b>:
30
31 7. No compiler warnings on the development machine.
32
33 8. The fossil executable that results from a build actually works.
34
35
36 <hr>
37 <h2>Commentary</h2>
38
39 Before you go ahead and push content back to the servers, make sure
40 that the username you are using by default matches your username
41 within the project. Also remember to enable the localauth setting
42 if you intend to make changes via a locally served web UI.
43
44 Item 1 is the most important step. Consider using <b>gdiff</b>
45 instead of <b>diff</b> if you have a graphical differ configured. Or,
46 pipe the output of "<b>fossil diff</b>" into "<b>open -f</b>" (on a mac) to
47 get the diff output in a separate text window for easier viewing.
48

Keyboard Shortcuts

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