Fossil

Check-in [5f872175]
Login

Check-in [5f872175]

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

Overview
Comment:Documentation updates due to today's changes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA3-256: 5f8721753c268a7c482a68f53153f01a5c996cb2cb19fe5d243064dbc2ca55ee
User & Date: drh 2024-12-21 00:43:13
Context
2024-12-21
00:43
Documentation updates due to today's changes. ... (Leaf check-in: 5f872175 user: drh tags: trunk)
2024-12-20
21:16
Optimize sync of long cluster chains by sending all cluster artifacts on the third client/server round-trip. ... (check-in: 637fcef8 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to www/changes.wiki.
︙︙
16
17
18
19
20
21
22


23
24
25
26
27
28
29

     merge or update operation.
  *  Issue a warning if a user tries to commit on a check-in where the
     branch has been changed.
  *  When a merge conflict occurs, a new section is added to the conflict
     text that shows Fossil's suggested resolution to the conflict.
  *  Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show
     diffs of multiple files.


  *  Fix a bug in [/help?cmd=patch|fossil patch create] that causes
     [/help?cmd=revert|fossil revert] operations that happened on individual
     files after a [/help?cmd=merge|fossil merge] to be omitted from the
     patch.

<h2 id='v2_25'>Changes for version 2.25 (2024-11-06)</h2>









>
>








16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

     merge or update operation.
  *  Issue a warning if a user tries to commit on a check-in where the
     branch has been changed.
  *  When a merge conflict occurs, a new section is added to the conflict
     text that shows Fossil's suggested resolution to the conflict.
  *  Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show
     diffs of multiple files.
  *  Added the [/help?cmd=/clusterlist|/clusterlist page] for analysis
     and debugging
  *  Fix a bug in [/help?cmd=patch|fossil patch create] that causes
     [/help?cmd=revert|fossil revert] operations that happened on individual
     files after a [/help?cmd=merge|fossil merge] to be omitted from the
     patch.

<h2 id='v2_25'>Changes for version 2.25 (2024-11-06)</h2>
︙︙
Changes to www/sync.wiki.
︙︙
787
788
789
790
791
792
793








794
795
796
797
798
799
800


<li><b>ci-unlock</b> <i>CLIENT-ID</i> A client sends the "ci-unlock" pragma to the server after
a successful commit.  This instructs the server to release
any lock on any check-in previously held by that client.
The ci-unlock pragma helps to avoid false-positive lock warnings
that might arise if a check-in is aborted and then restarted
on a branch.








</ol>

<h3 id="comment">3.12 Comment Cards</h3>

Any card that begins with "#" (ASCII 0x23) is a comment card and
is silently ignored.









>
>
>
>
>
>
>
>








787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808


<li><b>ci-unlock</b> <i>CLIENT-ID</i> A client sends the "ci-unlock" pragma to the server after
a successful commit.  This instructs the server to release
any lock on any check-in previously held by that client.
The ci-unlock pragma helps to avoid false-positive lock warnings
that might arise if a check-in is aborted and then restarted
on a branch.

<li><b>req-clusters</b> A client sends the "req-clusters" pragma
to the server to ask the server to reply with "igot" cards for
every [./fileformat.wiki#cluster|cluster artifact] that it holds.  The
client typically does this when it thinks that it might be attempting
to pull a long chain of cluster artifacts.  Sending the artifacts
all at once can dramatically reduce the number of round trip
messages needed to complete the synchronization.
</ol>

<h3 id="comment">3.12 Comment Cards</h3>

Any card that begins with "#" (ASCII 0x23) is a comment card and
is silently ignored.
︙︙