Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add the new special name start:BRANCH to refer to the first check-in of the branch. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
fab8d922154df9e54a3b6b0ef0ba4328 |
| User & Date: | danield 2022-04-25 06:08:09.326 |
Context
|
2022-04-26
| ||
| 14:27 | Fix a few **unused-but-set-variable** warnings. (reported by recent clang on MacOS at least). Also fix a **warn_unused_result** warning when calling nice() (gcc 7.5.0 on Ubuntu-18.04 and gcc 9.3.0 on Ubuntu-20.04) check-in: 74250821b1 user: mgagnon tags: trunk | |
| 04:12 | Update the built-in zlib to version 1.2.12, released on March 27, 2022. In accordance with check-in [eea86cee3a], all files from the doc/ subdirectory are excluded, but new sample programs from the examples/ subdirectory are included. check-in: c6567d4b99 user: florian tags: zlib-update | |
|
2022-04-25
| ||
| 06:08 | Add the new special name start:BRANCH to refer to the first check-in of the branch. check-in: fab8d92215 user: danield tags: trunk | |
| 06:07 | Merge in trunk. Closed-Leaf check-in: cff92f2e6d user: danield tags: name-start | |
| 01:31 | Update to the lastest version of Pikchr which fixes a bug in the computation of bounding boxes for circles when the size of the circle is set using the "diameter" attribute. check-in: 287d13f391 user: drh tags: trunk | |
Changes
Changes to src/name.c.
| ︙ | ︙ | |||
259 260 261 262 263 264 265 266 267 268 269 270 271 272 | ** * "current" ** * "prev" or "previous" ** * "next" ** ** The following modifier prefixes may be applied to the above forms: ** ** * "root:BR" = The origin of the branch named BR. ** * "merge-in:BR" = The most recent merge-in for the branch named BR. ** ** In those forms, BR may be any symbolic form but is assumed to be a ** checkin. Thus root:2021-02-01 would resolve to a checkin, possibly ** in a branch and possibly in the trunk, but never a wiki edit or ** forum post. ** | > | 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | ** * "current" ** * "prev" or "previous" ** * "next" ** ** The following modifier prefixes may be applied to the above forms: ** ** * "root:BR" = The origin of the branch named BR. ** * "start:BR" = The first check-in of the branch named BR. ** * "merge-in:BR" = The most recent merge-in for the branch named BR. ** ** In those forms, BR may be any symbolic form but is assumed to be a ** checkin. Thus root:2021-02-01 would resolve to a checkin, possibly ** in a branch and possibly in the trunk, but never a wiki edit or ** forum post. ** |
| ︙ | ︙ | |||
376 377 378 379 380 381 382 |
}
/* root:BR -> The origin of the branch named BR */
if( strncmp(zTag, "root:", 5)==0 ){
rid = symbolic_name_to_rid(zTag+5, zType);
return start_of_branch(rid, 0);
}
| > > > > > > > | | 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 |
}
/* root:BR -> The origin of the branch named BR */
if( strncmp(zTag, "root:", 5)==0 ){
rid = symbolic_name_to_rid(zTag+5, zType);
return start_of_branch(rid, 0);
}
/* start:BR -> The first check-in on branch named BR */
if( strncmp(zTag, "start:", 6)==0 ){
rid = symbolic_name_to_rid(zTag+6, zType);
return start_of_branch(rid, 1);
}
/* merge-in:BR -> Most recent merge-in for the branch named BR */
if( strncmp(zTag, "merge-in:", 9)==0 ){
rid = symbolic_name_to_rid(zTag+9, zType);
return start_of_branch(rid, 2);
}
/* symbolic-name ":" date-time */
nTag = strlen(zTag);
|
| ︙ | ︙ |
Changes to www/changes.wiki.
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 |
[./checkin_names.wiki#root|"root:BRANCHNAME" style of tag],
accomplished using a Common Table Expression in the underlying SQL.
* Add the new "[/help?cmd=describe|fossil describe]" command.
* Markdown subsystem extended with [../src/markdown.md#ftnts|footnotes support].
See corresponding [../test/markdown-test3.md|test cases],
[/wiki?name=branch/markdown-footnotes#il|known limitations] and
[forum:/forumthread/ee1f1597e46ec07a|discussion].
<h2 id='v2_18'>Changes for version 2.18 (2022-02-23)</h2>
* Added support for [./ssl-server.md|SSL/TLS server mode] for commands
like "[/help?cmd=server|fossil server]" and "[/help?cmd=http|fossil http]"
* The new [/help?cmd=cherry-pick|cherry-pick command] is an alias for
[/help?cmd=merge|merge --cherrypick].
* Add new setting "[/help?cmd=large-file-size|large-file-size]". If the size
| > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
[./checkin_names.wiki#root|"root:BRANCHNAME" style of tag],
accomplished using a Common Table Expression in the underlying SQL.
* Add the new "[/help?cmd=describe|fossil describe]" command.
* Markdown subsystem extended with [../src/markdown.md#ftnts|footnotes support].
See corresponding [../test/markdown-test3.md|test cases],
[/wiki?name=branch/markdown-footnotes#il|known limitations] and
[forum:/forumthread/ee1f1597e46ec07a|discussion].
* Add the new special name "start:BRANCH" to refer to the first check-in of
the branch.
<h2 id='v2_18'>Changes for version 2.18 (2022-02-23)</h2>
* Added support for [./ssl-server.md|SSL/TLS server mode] for commands
like "[/help?cmd=server|fossil server]" and "[/help?cmd=http|fossil http]"
* The new [/help?cmd=cherry-pick|cherry-pick command] is an alias for
[/help?cmd=merge|merge --cherrypick].
* Add new setting "[/help?cmd=large-file-size|large-file-size]". If the size
|
| ︙ | ︙ |
Changes to www/checkin_names.wiki.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | <title>Check-in Names</title> <table align="right" border="1" width="33%" cellpadding="10"> <tr><td> <h3>Quick Reference</h3> <ul> <li> Hash prefix <li> Branch name <li> Tag name <li> Timestamp: <i>YYYY-MM-DD HH:MM:SS</i> <li> <i>tag-name</i> <big><b>:</b></big> <i>timestamp</i> <li> <b>root <big>:</big></b> <i>branchname</i> <li> <b>merge-in <big>:</big></b> <i>branchname</i> <li> Special names: <ul> <li> <b>tip</b> <li> <b>current</b> <li> <b>next</b> <li> <b>previous</b> or <b>prev</b> | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | <title>Check-in Names</title> <table align="right" border="1" width="33%" cellpadding="10"> <tr><td> <h3>Quick Reference</h3> <ul> <li> Hash prefix <li> Branch name <li> Tag name <li> Timestamp: <i>YYYY-MM-DD HH:MM:SS</i> <li> <i>tag-name</i> <big><b>:</b></big> <i>timestamp</i> <li> <b>root <big>:</big></b> <i>branchname</i> <li> <b>start <big>:</big></b> <i>branchname</i> <li> <b>merge-in <big>:</big></b> <i>branchname</i> <li> Special names: <ul> <li> <b>tip</b> <li> <b>current</b> <li> <b>next</b> <li> <b>previous</b> or <b>prev</b> |
| ︙ | ︙ | |||
232 233 234 235 236 237 238 239 240 241 242 243 244 245 | You can solve this by using the prefix "<tt>merge-in:</tt>" instead of "<tt>root:</tt>" to tell Fossil to find the most recent merge-in point for that branch. The resulting diff will then show only the changes in the branch itself, omitting any changes that have already been merged in from the parent branch. The prefixes "<tt>root:</tt>" and "<tt>merge-in:</tt>" can be chained: one can say for example <blockquote><tt> fossil info merge-in:xyzzy:2022-03-01 </tt></blockquote> | > > > | 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | You can solve this by using the prefix "<tt>merge-in:</tt>" instead of "<tt>root:</tt>" to tell Fossil to find the most recent merge-in point for that branch. The resulting diff will then show only the changes in the branch itself, omitting any changes that have already been merged in from the parent branch. <a id="start"></a> The prefix "<tt>start:</tt>" gives the first check-in of the named branch. The prefixes "<tt>root:</tt>" and "<tt>merge-in:</tt>" can be chained: one can say for example <blockquote><tt> fossil info merge-in:xyzzy:2022-03-01 </tt></blockquote> |
| ︙ | ︙ | |||
297 298 299 300 301 302 303 304 305 306 307 308 309 310 |
Fossil currently resolves name strings to artifact hashes in the
following order:
# Exact matches on [#special | the special names]
# [#timestamps | Timestamps], with preference to ISO8601 forms
# [#tagpfx | tag:TAGNAME]
# [#root | root:BRANCH]
# [#merge-in | merge-in:BRANCH]
# [#tag-ts | TAGNAME:timestamp]
# Full artifact hash or hash prefix.
# Any other type of symbolic name that Fossil extracts from
artifacts.
<div style="height:50em" id="this-space-intentionally-left-blank"></div>
| > | 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 |
Fossil currently resolves name strings to artifact hashes in the
following order:
# Exact matches on [#special | the special names]
# [#timestamps | Timestamps], with preference to ISO8601 forms
# [#tagpfx | tag:TAGNAME]
# [#root | root:BRANCH]
# [#start | start:BRANCH]
# [#merge-in | merge-in:BRANCH]
# [#tag-ts | TAGNAME:timestamp]
# Full artifact hash or hash prefix.
# Any other type of symbolic name that Fossil extracts from
artifacts.
<div style="height:50em" id="this-space-intentionally-left-blank"></div>
|