Fossil SCM
Updates to the change log.
Commit
42d73f2aafeaf468e021eae2cb9f6fbc2ef7311b06fa0e055f98ac0651758235
Parent
37407fe616ce198…
1 file changed
+20
-10
+20
-10
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -1,25 +1,35 @@ | ||
| 1 | 1 | <title>Change Log</title> |
| 2 | 2 | |
| 3 | 3 | <h2 id='v2_26'>Changes for version 2.26 (pending)</h2> |
| 4 | 4 | |
| 5 | - * Enhanced the --from option on "[/help?cmd=diff|fossil diff]" so that | |
| 6 | - it optionally accepts a directory name as its argument, and uses files | |
| 7 | - under that directory as the baseline for the diff. | |
| 5 | + * Enhancements to [/help?cmd=diff|fossil diff] and similar: | |
| 6 | + <ol type="a"> | |
| 7 | + <li> The --from can optionally accepts a directory name as its argument, | |
| 8 | + and uses files under that directory as the baseline for the diff. | |
| 9 | + <li> For "gdiff", if no [/help?cmd=gdiff-command|gdiff-command setting] | |
| 10 | + is defined, Fossil tries to do a --tk diff if "tclsh" and "wish" | |
| 11 | + are available, or a --by diff if not. | |
| 12 | + <li> The "Reload" button is added to --tk diffs, to bring the displayed | |
| 13 | + diff up to date with the latest changes on disk. | |
| 14 | + <li> Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show | |
| 15 | + diffs of multiple files. | |
| 16 | + </ol> | |
| 8 | 17 | * Added the [/help?cmd=/ckout|/ckout web page] to provide information |
| 9 | 18 | about pending changes in a working check-out |
| 10 | 19 | * The [/help?cmd=ui|fossil ui] command defaults to using the |
| 11 | 20 | [/help?cmd=/ckout|/ckout page] as its start page. Or, if the |
| 12 | 21 | "--from PATH" option is present, the default start page becomes |
| 13 | 22 | "/ckout?exbase=PATH". |
| 14 | - * Added the [/help?cmd=merge-info|fossil merge-info] command and especially | |
| 15 | - the --tk option to that command, to provide analysis of the most recent | |
| 16 | - merge or update operation. | |
| 17 | - * When a merge conflict occurs, a new section is added to the conflict | |
| 18 | - text that shows Fossil's suggested resolution to the conflict. | |
| 19 | - * Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show | |
| 20 | - diffs of multiple files. | |
| 23 | + * Enhancements to [/help?cmd=merge|fossil merge]: | |
| 24 | + <ol type="a"> | |
| 25 | + <li> Added the [/help?cmd=merge-info|fossil merge-info] command and especially | |
| 26 | + the --tk option to that command, to provide analysis of the most recent | |
| 27 | + merge or update operation. | |
| 28 | + <li> When a merge conflict occurs, a new section is added to the conflict | |
| 29 | + text that shows Fossil's suggested resolution to the conflict. | |
| 30 | + </ol> | |
| 21 | 31 | * Enhancements to [/help?cmd=commit|fossil commit]: |
| 22 | 32 | <ol type="a"> |
| 23 | 33 | <li> If Fossil sees potential formatting mistakes (bad hyperlinks) |
| 24 | 34 | in the check-in comment, it will alert the developer and give |
| 25 | 35 | him or her the opportunity to edit the comment before continuing. |
| 26 | 36 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,25 +1,35 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <h2 id='v2_26'>Changes for version 2.26 (pending)</h2> |
| 4 | |
| 5 | * Enhanced the --from option on "[/help?cmd=diff|fossil diff]" so that |
| 6 | it optionally accepts a directory name as its argument, and uses files |
| 7 | under that directory as the baseline for the diff. |
| 8 | * Added the [/help?cmd=/ckout|/ckout web page] to provide information |
| 9 | about pending changes in a working check-out |
| 10 | * The [/help?cmd=ui|fossil ui] command defaults to using the |
| 11 | [/help?cmd=/ckout|/ckout page] as its start page. Or, if the |
| 12 | "--from PATH" option is present, the default start page becomes |
| 13 | "/ckout?exbase=PATH". |
| 14 | * Added the [/help?cmd=merge-info|fossil merge-info] command and especially |
| 15 | the --tk option to that command, to provide analysis of the most recent |
| 16 | merge or update operation. |
| 17 | * When a merge conflict occurs, a new section is added to the conflict |
| 18 | text that shows Fossil's suggested resolution to the conflict. |
| 19 | * Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show |
| 20 | diffs of multiple files. |
| 21 | * Enhancements to [/help?cmd=commit|fossil commit]: |
| 22 | <ol type="a"> |
| 23 | <li> If Fossil sees potential formatting mistakes (bad hyperlinks) |
| 24 | in the check-in comment, it will alert the developer and give |
| 25 | him or her the opportunity to edit the comment before continuing. |
| 26 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,25 +1,35 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <h2 id='v2_26'>Changes for version 2.26 (pending)</h2> |
| 4 | |
| 5 | * Enhancements to [/help?cmd=diff|fossil diff] and similar: |
| 6 | <ol type="a"> |
| 7 | <li> The --from can optionally accepts a directory name as its argument, |
| 8 | and uses files under that directory as the baseline for the diff. |
| 9 | <li> For "gdiff", if no [/help?cmd=gdiff-command|gdiff-command setting] |
| 10 | is defined, Fossil tries to do a --tk diff if "tclsh" and "wish" |
| 11 | are available, or a --by diff if not. |
| 12 | <li> The "Reload" button is added to --tk diffs, to bring the displayed |
| 13 | diff up to date with the latest changes on disk. |
| 14 | <li> Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show |
| 15 | diffs of multiple files. |
| 16 | </ol> |
| 17 | * Added the [/help?cmd=/ckout|/ckout web page] to provide information |
| 18 | about pending changes in a working check-out |
| 19 | * The [/help?cmd=ui|fossil ui] command defaults to using the |
| 20 | [/help?cmd=/ckout|/ckout page] as its start page. Or, if the |
| 21 | "--from PATH" option is present, the default start page becomes |
| 22 | "/ckout?exbase=PATH". |
| 23 | * Enhancements to [/help?cmd=merge|fossil merge]: |
| 24 | <ol type="a"> |
| 25 | <li> Added the [/help?cmd=merge-info|fossil merge-info] command and especially |
| 26 | the --tk option to that command, to provide analysis of the most recent |
| 27 | merge or update operation. |
| 28 | <li> When a merge conflict occurs, a new section is added to the conflict |
| 29 | text that shows Fossil's suggested resolution to the conflict. |
| 30 | </ol> |
| 31 | * Enhancements to [/help?cmd=commit|fossil commit]: |
| 32 | <ol type="a"> |
| 33 | <li> If Fossil sees potential formatting mistakes (bad hyperlinks) |
| 34 | in the check-in comment, it will alert the developer and give |
| 35 | him or her the opportunity to edit the comment before continuing. |
| 36 |