Fossil SCM
Update the pre-checkin checklist to talk about the new --tk option to the diff command.
Commit
394177917c6d66df3089140a816f60b9b911a2c3
Parent
3a5e81cedb0bd2c…
1 file changed
+9
-5
+9
-5
| --- www/checkin.wiki | ||
| +++ www/checkin.wiki | ||
| @@ -16,12 +16,12 @@ | ||
| 16 | 16 | </ol> |
| 17 | 17 | |
| 18 | 18 | 2. <b>fossil extra</b> → no unmanaged files need to be added. |
| 19 | 19 | |
| 20 | 20 | 3. The check-in will go onto the desired branch. |
| 21 | - → Do <u>not</u> check into trunk without prior approval from | |
| 22 | - the lead programmer (drh)! | |
| 21 | + → Check-ins to trunk normally require approval from | |
| 22 | + the lead programmer (drh). | |
| 23 | 23 | |
| 24 | 24 | 4. auto-sync is on, or the system clock is verified |
| 25 | 25 | |
| 26 | 26 | 5. If sources files have been added or removed, ensure all makefiles |
| 27 | 27 | and configure scripts have been updated accordingly. |
| @@ -40,13 +40,17 @@ | ||
| 40 | 40 | that the username you are using by default matches your username |
| 41 | 41 | within the project. Also remember to enable the localauth setting |
| 42 | 42 | if you intend to make changes via a locally served web UI. |
| 43 | 43 | |
| 44 | 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. | |
| 45 | +instead of <b>diff</b> if you have a graphical differ configured. Or | |
| 46 | +use the command-line option <b>--tk</b>. Also consider the <b>-N</b> | |
| 47 | +command-line option to show the complete text newly added files. | |
| 48 | +The recommended command for completing checklist item 1 is: | |
| 49 | + | |
| 50 | + <b>fossil diff --tk -N</b> | |
| 51 | + | |
| 48 | 52 | Look carefully at every changed line in item 1. |
| 49 | 53 | Make sure that you are not about to commit unrelated changes. |
| 50 | 54 | If there are two or more unrelated changes present, consider |
| 51 | 55 | breaking up the commit into two or more separate commits. |
| 52 | 56 | Always make 100% sure that all changes are compatible with the |
| 53 | 57 |
| --- www/checkin.wiki | |
| +++ www/checkin.wiki | |
| @@ -16,12 +16,12 @@ | |
| 16 | </ol> |
| 17 | |
| 18 | 2. <b>fossil extra</b> → no unmanaged files need to be added. |
| 19 | |
| 20 | 3. The check-in will go onto the desired branch. |
| 21 | → Do <u>not</u> check into trunk without prior approval from |
| 22 | the lead programmer (drh)! |
| 23 | |
| 24 | 4. auto-sync is on, or the system clock is verified |
| 25 | |
| 26 | 5. If sources files have been added or removed, ensure all makefiles |
| 27 | and configure scripts have been updated accordingly. |
| @@ -40,13 +40,17 @@ | |
| 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 | Look carefully at every changed line in item 1. |
| 49 | Make sure that you are not about to commit unrelated changes. |
| 50 | If there are two or more unrelated changes present, consider |
| 51 | breaking up the commit into two or more separate commits. |
| 52 | Always make 100% sure that all changes are compatible with the |
| 53 |
| --- www/checkin.wiki | |
| +++ www/checkin.wiki | |
| @@ -16,12 +16,12 @@ | |
| 16 | </ol> |
| 17 | |
| 18 | 2. <b>fossil extra</b> → no unmanaged files need to be added. |
| 19 | |
| 20 | 3. The check-in will go onto the desired branch. |
| 21 | → Check-ins to trunk normally require approval from |
| 22 | the lead programmer (drh). |
| 23 | |
| 24 | 4. auto-sync is on, or the system clock is verified |
| 25 | |
| 26 | 5. If sources files have been added or removed, ensure all makefiles |
| 27 | and configure scripts have been updated accordingly. |
| @@ -40,13 +40,17 @@ | |
| 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 | use the command-line option <b>--tk</b>. Also consider the <b>-N</b> |
| 47 | command-line option to show the complete text newly added files. |
| 48 | The recommended command for completing checklist item 1 is: |
| 49 | |
| 50 | <b>fossil diff --tk -N</b> |
| 51 | |
| 52 | Look carefully at every changed line in item 1. |
| 53 | Make sure that you are not about to commit unrelated changes. |
| 54 | If there are two or more unrelated changes present, consider |
| 55 | breaking up the commit into two or more separate commits. |
| 56 | Always make 100% sure that all changes are compatible with the |
| 57 |