Fossil

Check-in [d41074f8]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge the msw-hack branch into trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d41074f86294dc96eedc97b8df9b3b3c0eca3089
User & Date: drh 2011-08-23 16:55:58
Context
2011-08-23
18:00
go back to the old numbering on the pre-checkin checklist (ok'd drh). check-in: a87717ad user: martin.weber tags: trunk
17:23
catch up with trunk & fix commentary portion of checkin.wiki. check-in: 35e33287 user: martin.weber tags: msw-hack
16:55
Merge the msw-hack branch into trunk. check-in: d41074f8 user: drh tags: trunk
15:45
Fix several harmless compiler warnings. check-in: 553159aa user: drh tags: trunk
01:44
catch up with trunk; update the pre-checkin list to include checking for your username. check-in: a1f39877 user: martin.weber tags: msw-hack
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to www/checkin.wiki.

1
2
3
4
5
6
7


8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35





36
37
38
39
40
41
42
<title>Check-in Checklist</title>

<h2><u>Always</u> run the following checklist prior to <u>every</u>
check-in or commit to the Fossil repository:</h2>

Before every check-in:



  1.   <b>fossil diff</b> &rarr;
       <ol type="a">
       <li> No stray changes
       <li> All changes comply with the license
       <li> All inputs are scrubbed before use
       <li> No injection attacks via %s formats
       </ol>

  2.   <b>fossil extra</b> &rarr; no unmanaged files need to be added.

  3.   The check-in will go onto the desired branch.
       &rarr;  Do <u>not</u> check into trunk without prior approval from
       the lead programmer (drh)!

  4.   auto-sync is on, or the system clock is verified

  5.   If sources files have been added or removed, ensure all makefiles
       and configure scripts have been updated accordingly.

Before every check-in to <b>trunk</b>:

  6.   No compiler warnings on the development machine.

  7.   The fossil executable that results from a build actually works.


<hr>
<h2>Commentary</h2>






Item 1 is the most important step.  Consider using <b>gdiff</b>
instead of <b>diff</b> if you have a graphical differ configured.  Or,
pipe the output of "<b>fossil diff</b>" into "<b>open -f</b>" (on a mac) to
get the diff output in a separate text window for easier viewing.
Look carefully at every changed line in item 1.
Make sure that you are not about to commit unrelated changes.







>
>
|







|

|



|

|




|

|




>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
<title>Check-in Checklist</title>

<h2><u>Always</u> run the following checklist prior to <u>every</u>
check-in or commit to the Fossil repository:</h2>

Before every check-in:

  1.   <b>fossil user default</b> &rarr; your username is correct.

  2.   <b>fossil diff</b> &rarr;
       <ol type="a">
       <li> No stray changes
       <li> All changes comply with the license
       <li> All inputs are scrubbed before use
       <li> No injection attacks via %s formats
       </ol>

  3.   <b>fossil extra</b> &rarr; no unmanaged files need to be added.

  4.   The check-in will go onto the desired branch.
       &rarr;  Do <u>not</u> check into trunk without prior approval from
       the lead programmer (drh)!

  5.   auto-sync is on, or the system clock is verified

  6.   If sources files have been added or removed, ensure all makefiles
       and configure scripts have been updated accordingly.

Before every check-in to <b>trunk</b>:

  7.   No compiler warnings on the development machine.

  8.   The fossil executable that results from a build actually works.


<hr>
<h2>Commentary</h2>

Before you go ahead and push content back to the servers, make sure
that the username you are using by default matches your username
within the project. Also remember to enable the localauth setting
if you intend to make changes via a locally served web UI.

Item 1 is the most important step.  Consider using <b>gdiff</b>
instead of <b>diff</b> if you have a graphical differ configured.  Or,
pipe the output of "<b>fossil diff</b>" into "<b>open -f</b>" (on a mac) to
get the diff output in a separate text window for easier viewing.
Look carefully at every changed line in item 1.
Make sure that you are not about to commit unrelated changes.