Fossil SCM
Documentation updates due to today's changes.
Commit
5f8721753c268a7c482a68f53153f01a5c996cb2cb19fe5d243064dbc2ca55ee
Parent
637fcef83023bad…
2 files changed
+2
+8
+2
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -18,10 +18,12 @@ | ||
| 18 | 18 | branch has been changed. |
| 19 | 19 | * When a merge conflict occurs, a new section is added to the conflict |
| 20 | 20 | text that shows Fossil's suggested resolution to the conflict. |
| 21 | 21 | * Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show |
| 22 | 22 | diffs of multiple files. |
| 23 | + * Added the [/help?cmd=/clusterlist|/clusterlist page] for analysis | |
| 24 | + and debugging | |
| 23 | 25 | * Fix a bug in [/help?cmd=patch|fossil patch create] that causes |
| 24 | 26 | [/help?cmd=revert|fossil revert] operations that happened on individual |
| 25 | 27 | files after a [/help?cmd=merge|fossil merge] to be omitted from the |
| 26 | 28 | patch. |
| 27 | 29 | |
| 28 | 30 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -18,10 +18,12 @@ | |
| 18 | branch has been changed. |
| 19 | * When a merge conflict occurs, a new section is added to the conflict |
| 20 | text that shows Fossil's suggested resolution to the conflict. |
| 21 | * Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show |
| 22 | diffs of multiple files. |
| 23 | * Fix a bug in [/help?cmd=patch|fossil patch create] that causes |
| 24 | [/help?cmd=revert|fossil revert] operations that happened on individual |
| 25 | files after a [/help?cmd=merge|fossil merge] to be omitted from the |
| 26 | patch. |
| 27 | |
| 28 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -18,10 +18,12 @@ | |
| 18 | branch has been changed. |
| 19 | * When a merge conflict occurs, a new section is added to the conflict |
| 20 | text that shows Fossil's suggested resolution to the conflict. |
| 21 | * Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show |
| 22 | diffs of multiple files. |
| 23 | * Added the [/help?cmd=/clusterlist|/clusterlist page] for analysis |
| 24 | and debugging |
| 25 | * Fix a bug in [/help?cmd=patch|fossil patch create] that causes |
| 26 | [/help?cmd=revert|fossil revert] operations that happened on individual |
| 27 | files after a [/help?cmd=merge|fossil merge] to be omitted from the |
| 28 | patch. |
| 29 | |
| 30 |
+8
| --- www/sync.wiki | ||
| +++ www/sync.wiki | ||
| @@ -789,10 +789,18 @@ | ||
| 789 | 789 | a successful commit. This instructs the server to release |
| 790 | 790 | any lock on any check-in previously held by that client. |
| 791 | 791 | The ci-unlock pragma helps to avoid false-positive lock warnings |
| 792 | 792 | that might arise if a check-in is aborted and then restarted |
| 793 | 793 | on a branch. |
| 794 | + | |
| 795 | +<li><b>req-clusters</b> A client sends the "req-clusters" pragma | |
| 796 | +to the server to ask the server to reply with "igot" cards for | |
| 797 | +every [./fileformat.wiki#cluster|cluster artifact] that it holds. The | |
| 798 | +client typically does this when it thinks that it might be attempting | |
| 799 | +to pull a long chain of cluster artifacts. Sending the artifacts | |
| 800 | +all at once can dramatically reduce the number of round trip | |
| 801 | +messages needed to complete the synchronization. | |
| 794 | 802 | </ol> |
| 795 | 803 | |
| 796 | 804 | <h3 id="comment">3.12 Comment Cards</h3> |
| 797 | 805 | |
| 798 | 806 | Any card that begins with "#" (ASCII 0x23) is a comment card and |
| 799 | 807 |
| --- www/sync.wiki | |
| +++ www/sync.wiki | |
| @@ -789,10 +789,18 @@ | |
| 789 | a successful commit. This instructs the server to release |
| 790 | any lock on any check-in previously held by that client. |
| 791 | The ci-unlock pragma helps to avoid false-positive lock warnings |
| 792 | that might arise if a check-in is aborted and then restarted |
| 793 | on a branch. |
| 794 | </ol> |
| 795 | |
| 796 | <h3 id="comment">3.12 Comment Cards</h3> |
| 797 | |
| 798 | Any card that begins with "#" (ASCII 0x23) is a comment card and |
| 799 |
| --- www/sync.wiki | |
| +++ www/sync.wiki | |
| @@ -789,10 +789,18 @@ | |
| 789 | a successful commit. This instructs the server to release |
| 790 | any lock on any check-in previously held by that client. |
| 791 | The ci-unlock pragma helps to avoid false-positive lock warnings |
| 792 | that might arise if a check-in is aborted and then restarted |
| 793 | on a branch. |
| 794 | |
| 795 | <li><b>req-clusters</b> A client sends the "req-clusters" pragma |
| 796 | to the server to ask the server to reply with "igot" cards for |
| 797 | every [./fileformat.wiki#cluster|cluster artifact] that it holds. The |
| 798 | client typically does this when it thinks that it might be attempting |
| 799 | to pull a long chain of cluster artifacts. Sending the artifacts |
| 800 | all at once can dramatically reduce the number of round trip |
| 801 | messages needed to complete the synchronization. |
| 802 | </ol> |
| 803 | |
| 804 | <h3 id="comment">3.12 Comment Cards</h3> |
| 805 | |
| 806 | Any card that begins with "#" (ASCII 0x23) is a comment card and |
| 807 |